aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-07-25 16:54:09 +0100
committerGareth Rees <gareth@mysociety.org>2014-08-04 15:23:46 +0100
commit453a4acd8d062ce1c500ce30af5b4b70ab5ded64 (patch)
tree25743db04232761eb2c66e1341972bf9829a9f68
parent8ba36f17390b09acccccbdd261d4fc43ed31f7c7 (diff)
Use correct site name for purge-varnish log and pid
Allows the log and pid file names to be set dynamically by the config_files:convert_init_script rake task. ENV[‘SITE’] can be specified to name the particular install – e.g. rather than 'alaveteli' you might name the site 'foi' – so now the log and pid files are created with the correct name rather than simply 'purge-varnish'
-rwxr-xr-xconfig/purge-varnish-debian.ugly4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly
index a2418b8eb..78be365dc 100755
--- a/config/purge-varnish-debian.ugly
+++ b/config/purge-varnish-debian.ugly
@@ -15,8 +15,8 @@
NAME=!!(*= $daemon_name *)!!
DAEMON=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/script/runner
DAEMON_ARGS="--daemon PurgeRequest.purge_all_loop"
-PIDFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/tmp/pids/purge-varnish.pid
-LOGFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log/purge-varnish.log
+PIDFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/tmp/pids/!!(*= $daemon_name *)!!.pid
+LOGFILE=!!(*= $vhost_dir *)!!/!!(*= $vcspath *)!!/log/!!(*= $daemon_name *)!!.log
DUSER=!!(*= $user *)!!
# Set RAILS_ENV - not needed if using config/rails_env.rb
# RAILS_ENV=your_rails_env