diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 11 | ||||
| -rw-r--r-- | conf/general.yml-example | 3 | ||||
| l--------- | conf/packages | 2 | ||||
| -rw-r--r-- | conf/packages.debian-squeeze+testing | 38 |
4 files changed, 48 insertions, 6 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 4052275ee..087021fd1 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -7,10 +7,10 @@ # $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 { *)!! +!!(* if ($vhost eq 'www.fixmystreet.com' || $vhost eq 'reportemptyhomes.com') { *)!! MAILTO=cron-!!(*= $site *)!!@mysociety.org +!!(* } else { *)!! +MAILTO=!!(*= $user *)!!@mysociety.org !!(* } *)!! # On only one server @@ -22,12 +22,15 @@ 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') || ($vhost eq 'integration-staging.fixmystreet.com')) { *)!! +!!(* } elsif (($vhost eq 'www.fixmystreet.com') || ($vhost eq 'bromley.test.mysociety.org') || ($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?" 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?" +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?" +0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/open311-populate-service-list.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/cron-wrapper open311-populate-service-list" || echo "stalled?" !!(* } *)!! diff --git a/conf/general.yml-example b/conf/general.yml-example index ec77e6ba8..93b54a3e7 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -62,4 +62,5 @@ RSS_LIMIT: '20' # Should problem reports link to the council summary pages? AREA_LINKS_FROM_PROBLEMS: '0' - +# used to override the STAGING SERVER safety mechanism in send-reports +TESTING_COUNCILS: diff --git a/conf/packages b/conf/packages index bc87d73be..b5287718b 120000 --- a/conf/packages +++ b/conf/packages @@ -1 +1 @@ -packages.debian-squeeze
\ No newline at end of file +packages.debian-squeeze+testing
\ No newline at end of file diff --git a/conf/packages.debian-squeeze+testing b/conf/packages.debian-squeeze+testing new file mode 100644 index 000000000..cec3a2624 --- /dev/null +++ b/conf/packages.debian-squeeze+testing @@ -0,0 +1,38 @@ +jhead +libdatetime-format-w3cdtf-perl +libcache-memcached-perl +libdbd-pg-perl +libdbi-perl +libdigest-sha1-perl +liberror-perl +libfcgi-perl +libfile-slurp-perl +libgeography-nationalgrid-perl +libhtml-parser-perl +libio-string-perl +liblingua-en-inflect-perl +liblocale-gettext-perl +libsoap-lite-perl +libstatistics-distributions-perl +liburi-perl +libwww-perl +libxml-rss-perl +memcached +perl +perl-base +perl-modules +perlmagick +libjson-perl +libimage-size-perl +libmath-bigint-gmp-perl +gettext +libtest-exception-perl +libipc-run3-perl +libyaml-perl +liblist-moreutils-perl +ruby-compass +libtemplate-perl +postgresql-8.4 +postgresql-server-dev-8.4 +gnuplot +ttf-bitstream-vera |