diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 6 | ||||
| -rw-r--r-- | conf/general.yml-example | 2 | ||||
| -rw-r--r-- | conf/httpd.conf-example | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 2d4467aab..4052275ee 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -7,7 +7,11 @@ # $Id: crontab.ugly,v 1.23 2010-01-07 10:32:24 louise Exp $ PATH=/usr/local/bin:/usr/bin:/bin +!!(* if ($vhost eq 'integration-staging.fixmystreet.com') { *)!! +MAILTO=dave@mysociety.org +!!(* } else { *)!! MAILTO=cron-!!(*= $site *)!!@mysociety.org +!!(* } *)!! # On only one server !!(* if ($vhost eq 'reportemptyhomes.com') { *)!! @@ -18,7 +22,7 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org #2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-alerts" || echo "stalled?" 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-questionnaires" || echo "stalled?" -!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com')) { *)!! +!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'matthew.fixmystreet.com') || ($vhost eq 'integration-staging.fixmystreet.com')) { *)!! 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports" || echo "stalled?" 0 0-8,10,11,13,14,16,17,19-23 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports" || echo "stalled?" 0 9,12,15,18 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-reports --verbose" || echo "stalled?" diff --git a/conf/general.yml-example b/conf/general.yml-example index 06af11a55..ec77e6ba8 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -61,3 +61,5 @@ RSS_LIMIT: '20' # Should problem reports link to the council summary pages? AREA_LINKS_FROM_PROBLEMS: '0' + + diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index c1b6d96c2..e7900161e 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -67,6 +67,7 @@ ExpiresByType text/css "access plus 10 years" ExpiresByType application/javascript "access plus 10 years" <Location /js/> AddOutputFilter DEFLATE js + Header append Cache-Control "no-transform" </Location> # Don't want jslib being passed to Catalyst |