diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 10 | ||||
| -rw-r--r-- | conf/general.yml-example | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 9330b43f3..4eb6d5a26 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -20,13 +20,20 @@ my @sending = qw( bromley.test.mysociety.org stevenage.test.mysociety.org barnet.fixmystreet.staging.mysociety.org + oxfordshire.fixmystreet.staging.mysociety.org fixmybarangay.test.mysociety.org demo.fixmybarangay.com www.fixmybarangay.com zurich.fixmystreet.staging.mysociety.org + seesomething.mysociety.org ); my @no_alerts = qw( zurich.fixmystreet.staging.mysociety.org + seesomething.mysociety.org +); +my @no_open311 = qw( + zurich.fixmystreet.staging.mysociety.org + seesomething.mysociety.org ); my %sending = map { $_ => 1 } @sending; my %no_alerts = map { $_ => 1 } @no_alerts; @@ -45,6 +52,7 @@ my %no_alerts = map { $_ => 1 } @no_alerts; 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-questionnaires" || echo "stalled?" !!(* } *)!! +!!(* if (!$no_open311{$vhost}) { *)!! # Open311 sending and fetching of updates 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-comments.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper send-comments" || echo "stalled?" 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/fetch-comments.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper fetch-comments" || echo "stalled?" @@ -57,6 +65,8 @@ my %no_alerts = map { $_ => 1 } @no_alerts; 0 8 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/open311-populate-service-list.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper open311-populate-service-list --warn" || echo "stalled?" !!(* } *)!! +!!(* } *)!! + # Once an hour, update the all reports stats 13 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper update-all-reports diff --git a/conf/general.yml-example b/conf/general.yml-example index 175b342a4..4a06a2aff 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -22,6 +22,10 @@ BASE_URL: 'http://www.example.org' EMAIL_DOMAIN: 'example.org' CONTACT_EMAIL: 'team@example.org' CONTACT_NAME: 'FixMyStreet' +# Address used for emails you don't expect a reply to (e.g. confirmation +# emails); can be same as CONTACT_EMAIL above, of course, if you don't have a +# special address. +DO_NOT_REPLY_EMAIL: 'do-not-reply@example.org' # Whether this is a development site or not. It will mean e.g. templates/ # CSS modified times aren't cached |