diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-06-23 11:26:40 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-06-23 11:26:40 +0100 |
| commit | cafc4250a4f2f4f41250da9d9c626d2e1528978c (patch) | |
| tree | de6b21b4ed4992f4e48d0a6d4ee6b9a1d7424dd5 /config | |
| parent | 81aeff8a2302b2e39eddae4ccab47c96d3ea4ff1 (diff) | |
| parent | dec7502393e8cf30ecf700965b3cf97824b1eae1 (diff) | |
Merge branch 'add-rbenv-shims' into develop
Diffstat (limited to 'config')
| -rwxr-xr-x | config/alert-tracks-debian.example | 4 | ||||
| -rw-r--r-- | config/crontab-example | 4 | ||||
| -rwxr-xr-x | config/purge-varnish-debian.example | 4 | ||||
| -rw-r--r-- | config/run-with-rbenv-path.example | 8 |
4 files changed, 20 insertions, 0 deletions
diff --git a/config/alert-tracks-debian.example b/config/alert-tracks-debian.example index a098bc332..ac4a55c8f 100755 --- a/config/alert-tracks-debian.example +++ b/config/alert-tracks-debian.example @@ -24,6 +24,10 @@ DUSER=!!(*= $user *)!! # RAILS_ENV=your_rails_env # export RAILS_ENV +# Uncomment the following line if running under rbenv - we want this daemon to run +# in the context of the ruby version defined for the site +# PATH=/home/!!(*= $user *)!!/.rbenv/shims:/usr/local/bin:/usr/bin:/bin + trap "" 1 export PIDFILE LOGFILE diff --git a/config/crontab-example b/config/crontab-example index bfcba0568..a83f418fa 100644 --- a/config/crontab-example +++ b/config/crontab-example @@ -5,6 +5,10 @@ # Email: hello@mysociety.org. WWW: http://www.mysociety.org/ PATH=/usr/local/bin:/usr/bin:/bin +# Uncomment the following line if running under rbenv - we want this cron to run +# in the context of the ruby version defined for the site +# PATH=/home/!!(*= $user *)!!/.rbenv/shims:/usr/local/bin:/usr/bin:/bin + MAILTO=!!(*= $mailto *)!! # Every 5 minutes diff --git a/config/purge-varnish-debian.example b/config/purge-varnish-debian.example index 457a77ed8..779266d2d 100755 --- a/config/purge-varnish-debian.example +++ b/config/purge-varnish-debian.example @@ -24,6 +24,10 @@ DUSER=!!(*= $user *)!! # RAILS_ENV=your_rails_env # export RAILS_ENV +# Uncomment the following line if running under rbenv - we want this daemon to run +# in the context of the ruby version defined for the site +# PATH=/home/!!(*= $user *)!!/.rbenv/shims:/usr/local/bin:/usr/bin:/bin + type varnishadm > /dev/null 2>&1 || exit trap "" 1 diff --git a/config/run-with-rbenv-path.example b/config/run-with-rbenv-path.example new file mode 100644 index 000000000..25dec9b60 --- /dev/null +++ b/config/run-with-rbenv-path.example @@ -0,0 +1,8 @@ +#!/bin/bash + +# We want this script to run in the context of the ruby version defined for the site +PATH=/home/!!(*= $user *)!!/.rbenv/shims:$PATH + +source "$1" + +exit $? |