diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 3 | ||||
| -rw-r--r-- | conf/httpd.conf-example | 1 | ||||
| l---------[-rw-r--r--] | conf/packages | 38 | ||||
| -rw-r--r-- | conf/packages.debian-squeeze | 38 |
4 files changed, 42 insertions, 38 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index f7a08b163..087021fd1 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -22,7 +22,7 @@ MAILTO=!!(*= $user *)!!@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 'bromley.test.mysociety.org') ) { *)!! +!!(* } 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?" @@ -42,6 +42,7 @@ MAILTO=!!(*= $user *)!!@mysociety.org 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph 00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! + !!(* if ($vhost eq 'www.fixmystreet.com') { *)!! 10 * * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet-virtualenv/bin/python /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/kasabi !!(* } *)!! 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 diff --git a/conf/packages b/conf/packages index 21ee0a862..bc87d73be 100644..120000 --- a/conf/packages +++ b/conf/packages @@ -1,37 +1 @@ -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 | libhaml-ruby -libtemplate-perl -postgresql-server-dev-8.4 -gnuplot -ttf-bitstream-vera +packages.debian-squeeze
\ No newline at end of file diff --git a/conf/packages.debian-squeeze b/conf/packages.debian-squeeze new file mode 100644 index 000000000..cb494157d --- /dev/null +++ b/conf/packages.debian-squeeze @@ -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 +libhaml-ruby +libtemplate-perl +postgresql-8.4 +postgresql-server-dev-8.4 +gnuplot +ttf-bitstream-vera |