diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 6 | ||||
| -rw-r--r-- | conf/general-example | 7 | ||||
| -rw-r--r-- | conf/httpd.conf | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index b77b824fd..69654f2a7 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -7,11 +7,7 @@ # $Id: crontab.ugly,v 1.23 2010-01-07 10:32:24 louise Exp $ PATH=/usr/local/bin:/usr/bin:/bin -!!(* if ($vhost eq "matthew.fixmystreet.com") { *)!! -MAILTO=matthew@mysociety.org -!!(* } else {*)!! -MAILTO=team@fixmystreet.com -!!(* } *)!! +MAILTO=cron-!!(*= $site *)!!@mysociety.org # On only one server !!(* if ($vhost eq 'reportemptyhomes.com') { *)!! diff --git a/conf/general-example b/conf/general-example index 283d8787b..f8c71c846 100644 --- a/conf/general-example +++ b/conf/general-example @@ -49,7 +49,12 @@ define('OPTION_GEO_CACHE', '/cache/'); define('OPTION_GOOGLE_MAPS_API_KEY', ''); define('OPTION_MAPIT_URL', 'http://services.mysociety.org/mapit'); -define('OPTION_TILES_URL', 'http://tilma.mysociety.org/tileserver/10k-full-london'); +define('OPTION_TILES_TYPE', '10k-full-london'); +define('OPTION_TILES_TIFF_SIZE_METRES', 5000); +define('OPTION_TILES_TIFF_SIZE_PIXELS', 7874); +define('OPTION_TILES_WIDTH', 254); +define('OPTION_TILES_URL', 'http://tilma.mysociety.org/tileserver/' . OPTION_TILES_TYPE . '/'); + define('OPTION_EVEL_URL', 'http://services.mysociety.org/evel'); define('OPTION_GAZE_URL', 'http://gaze.mysociety.org/gaze'); diff --git a/conf/httpd.conf b/conf/httpd.conf index b4d7c3dfd..1e6b8979e 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -47,8 +47,10 @@ RewriteRule ^/rss/([0-9]+)$ /rss.cgi?type=new_updates;id=$1 [QSA] # RSS feeds for new local problems RewriteRule ^/rss/([0-9]+)[,/]([0-9]+)$ /rss.cgi?type=local_problems;x=$1;y=$2 [QSA] +RewriteRule ^/rss/n/([0-9]+)[,/]([0-9]+)$ /rss.cgi?type=local_problems;e=$1;n=$2 [QSA] RewriteRule ^/rss/l/([0-9.-]+)[,/]([0-9.-]+)$ /rss.cgi?type=local_problems;lat=$1;lon=$2 [QSA] RewriteRule ^/rss/([0-9]+)[,/]([0-9]+)/([0-9]+)$ /rss.cgi?type=local_problems;x=$1;y=$2;d=$3 [QSA] +RewriteRule ^/rss/n/([0-9]+)[,/]([0-9]+)/([0-9]+)$ /rss.cgi?type=local_problems;e=$1;n=$2;d=$3 [QSA] RewriteRule ^/rss/l/([0-9.-]+)[,/]([0-9.-]+)/([0-9]+)$ /rss.cgi?type=local_problems;lat=$1;lon=$2;d=$3 [QSA] RewriteRule ^/rss/pc/(.*)$ /rss.cgi?type=local_problems;pc=$1 [QSA] RewriteRule ^/rss/problems$ /rss.cgi?type=new_problems [QSA] |