aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/alert-tracks-debian.ugly17
-rw-r--r--config/deploy.rb3
-rw-r--r--config/general.yml-example3
-rw-r--r--config/purge-varnish-debian.ugly17
4 files changed, 26 insertions, 14 deletions
diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly
index 5bd146061..2b52ad840 100644
--- a/config/alert-tracks-debian.ugly
+++ b/config/alert-tracks-debian.ugly
@@ -4,7 +4,7 @@
# Provides: alert-tracks
# Required-Start: $local_fs $syslog
# Required-Stop: $local_fs $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: alert-tracks is a daemon running the Alaveteli email alerts
# Description: alert-tracks send Alaveteli email alerts as required
@@ -13,11 +13,14 @@
# !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon
NAME=!!(*= $daemon_name *)!!
-DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner
+DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner
DAEMON_ARGS="--daemon TrackMailer.alert_tracks_loop"
-PIDFILE=/data/vhost/!!(*= $vhost *)!!/alert-tracks.pid
-LOGFILE=/data/vhost/!!(*= $vhost *)!!/logs/alert-tracks.log
+PIDFILE=!!(*= $vhost_dir *)!!/alert-tracks.pid
+LOGFILE=!!(*= $vhost_dir *)!!/logs/alert-tracks.log
DUSER=!!(*= $user *)!!
+# Set RAILS_ENV - not needed if using config/rails_env.rb
+# RAILS_ENV=your_rails_env
+# export RAILS_ENV
trap "" 1
@@ -48,17 +51,17 @@ case "$1" in
exit 0
fi
;;
-
+
start)
echo -n "Starting Alaveteli alert daemon: $NAME"
start_daemon
;;
-
+
stop)
echo -n "Stopping Alaveteli alert daemon: $NAME"
stop_daemon
;;
-
+
restart)
echo -n "Restarting Alaveteli alert daemon: $NAME"
stop_daemon
diff --git a/config/deploy.rb b/config/deploy.rb
index 888710f83..f82379df0 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -48,6 +48,9 @@ namespace :deploy do
links = {
"#{release_path}/config/database.yml" => "#{shared_path}/database.yml",
"#{release_path}/config/general.yml" => "#{shared_path}/general.yml",
+ "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb",
+ "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png",
+ "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png",
"#{release_path}/files" => "#{shared_path}/files",
"#{release_path}/cache" => "#{shared_path}/cache",
"#{release_path}/vendor/plugins/acts_as_xapian/xapiandbs" => "#{shared_path}/xapiandbs",
diff --git a/config/general.yml-example b/config/general.yml-example
index a6f657d96..fd27b151a 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -30,6 +30,9 @@ REPLY_LATE_AFTER_DAYS: 20
REPLY_VERY_LATE_AFTER_DAYS: 40
# We give some types of authority like schools a bit longer than everyone else
SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60
+# Whether the days above are given in working or calendar days. Value can be "working" or "calendar".
+# Default is "working".
+WORKING_OR_CALENDAR_DAYS: working
# example public bodies for the home page, semicolon delimited - short_names
FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq'
diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly
index 1a9259da8..af32650a8 100644
--- a/config/purge-varnish-debian.ugly
+++ b/config/purge-varnish-debian.ugly
@@ -4,7 +4,7 @@
# Provides: purge-varnish
# Required-Start: $local_fs $syslog
# Required-Stop: $local_fs $syslog
-# Default-Start: 2 3 4 5
+# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: purge-varnish is a daemon purging the Alaveteli varnish cache
# Description: purge-varnish purge the Alaveteli varnish cache
@@ -13,11 +13,14 @@
# !!(*= $daemon_name *)!! Start the Alaveteli email purge-varnish daemon
NAME=!!(*= $daemon_name *)!!
-DAEMON=/data/vhost/!!(*= $vhost *)!!/alaveteli/script/runner
+DAEMON=!!(*= $vhost_dir *)!!/alaveteli/script/runner
DAEMON_ARGS="--daemon PurgeRequest.purge_all_loop"
-PIDFILE=/data/vhost/!!(*= $vhost *)!!/purge-varnish.pid
-LOGFILE=/data/vhost/!!(*= $vhost *)!!/logs/purge-varnish.log
+PIDFILE=!!(*= $vhost_dir *)!!/purge-varnish.pid
+LOGFILE=!!(*= $vhost_dir *)!!/logs/purge-varnish.log
DUSER=!!(*= $user *)!!
+# Set RAILS_ENV - not needed if using config/rails_env.rb
+# RAILS_ENV=your_rails_env
+# export RAILS_ENV
trap "" 1
@@ -48,17 +51,17 @@ case "$1" in
exit 0
fi
;;
-
+
start)
echo -n "Starting Alaveteli purge-varnish daemon: $NAME"
start_daemon
;;
-
+
stop)
echo -n "Stopping Alaveteli purge-varnish daemon: $NAME"
stop_daemon
;;
-
+
restart)
echo -n "Restarting Alaveteli purge-varnish daemon: $NAME"
stop_daemon