diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
| commit | eb823376088f47abf23050a0193225a45b51d6d3 (patch) | |
| tree | a6eb5fc8cf694a7dd70d7d1a957d65ec09a6c60a /conf | |
| parent | bc39723b98a0bb07cc8d57e99489e3a014d857ef (diff) | |
| parent | 7fc1083eb431312a59758c473e8ff52ceb8585ef (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/common_header_tags.html
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 2 | ||||
| -rw-r--r-- | conf/httpd.conf-example | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index d1779ff73..415176779 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -33,5 +33,5 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org # Once a day on all servers 39 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problems-filed-graph 43 2 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/problem-creation-graph - +00 8 * * * !!(*= $user *)!! /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/check-for-zombies !!(*= $user *)!! diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example index 378aa88a5..8ed6a9c81 100644 --- a/conf/httpd.conf-example +++ b/conf/httpd.conf-example @@ -16,6 +16,7 @@ # # on production servers these are run under fastcgi # Options +ExecCGI # AddHandler cgi-script .cgi +# AllowOverride None # </Directory> # # <Directory /home/yourname/fixmystreet/web-admin> @@ -60,6 +61,14 @@ ProxyPassReverse /mapit/ http://mapit.mysociety.org/ RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f RewriteRule /(.+) /$1 [L] +# Performance things +ExpiresActive On +ExpiresByType text/css "access plus 10 years" +ExpiresByType application/javascript "access plus 10 years" +<Location /js/> + AddOutputFilter DEFLATE js +</Location> + # Don't want jslib being passed to Catalyst RewriteRule ^/jslib(.*) /jslib$1 [L,PT] |