diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/general-example | 12 | ||||
| -rw-r--r-- | conf/httpd.conf | 59 | ||||
| -rw-r--r-- | conf/packages | 4 |
3 files changed, 46 insertions, 29 deletions
diff --git a/conf/general-example b/conf/general-example index 0a5c9e44d..9da852bb8 100644 --- a/conf/general-example +++ b/conf/general-example @@ -25,14 +25,11 @@ define('OPTION_BCI_DB_NAME', 'bci'); define('OPTION_BCI_DB_USER', 'bci'); define('OPTION_BCI_DB_PASS', ''); -define('OPTION_DRESS_DB_HOST', 'localhost'); -define('OPTION_DRESS_DB_PORT', '5432'); -define('OPTION_DRESS_DB_NAME', 'dress'); -define('OPTION_DRESS_DB_USER', 'dress'); -define('OPTION_DRESS_DB_PASS', ''); - define('OPTION_BASE_URL', 'http://www.example.org'); +# Which country are you operating in? ISO3166-alpha2 code please +define('OPTION_COUNTRY', 'GB'); + define('OPTION_TESTING_EMAIL', 'testing@example.com'); define('OPTION_EMAIL_DOMAIN', 'example.org'); define('OPTION_CONTACT_EMAIL', 'team@'.OPTION_EMAIL_DOMAIN); @@ -47,8 +44,9 @@ define('OPTION_STAGING_SITE', 1); define('OPTION_UPLOAD_CACHE', '/upload/'); define('OPTION_GEO_CACHE', '/cache/'); define('OPTION_GOOGLE_MAPS_API_KEY', ''); +define('OPTION_BING_MAPS_API_KEY', ''); -define('OPTION_MAPIT_URL', 'http://services.mysociety.org/mapit'); +define('OPTION_MAPIT_URL', 'http://mapit.mysociety.org/'); define('OPTION_MAP_TYPE', 'Tilma::Original::1_10k'); 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 1e6b8979e..d9d564f79 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -1,24 +1,40 @@ -# Apache configuration for Broken Civic Infrastructure. +# Apache configuration for FixMyStreet. # -# Add lines something like this to your main /etc/apache/httpd.conf: +# Add lines something like this to your /etc/apache2/sites-enabled/fixmystreet - +# replacing '/home/yourname/fixmystreet' with the path to your install # # # FixMyStreet # <VirtualHost *:80> -# ServerName fixmystreet.owl -# DocumentRoot /home/francis/devel/fixmystreet/web/ -# <Directory /home/francis/devel/fixmystreet/web> -# Include /home/francis/devel/fixmystreet/conf/httpd.conf +# ServerName fixmystreet.yourservername +# DocumentRoot /home/yourname/fixmystreet/web/ +# +# # Pull in the specific config +# Include /home/yourname/fixmystreet/conf/httpd.conf +# +# <Directory /home/yourname/fixmystreet/web> +# # You also need to enable cgi files to run as CGI scripts. For example: +# # on production servers these are run under fastcgi +# Options +ExecCGI +# AddHandler cgi-script .cgi +# </Directory> +# +# <Directory /home/yourname/fixmystreet/web-admin> +# # +# # WARNING - enable auth here on production machine +# # +# Options +ExecCGI +# AddHandler cgi-script .cgi # </Directory> -# Alias /admin/ /home/francis/devel/fixmystreet/web-admin/ -# </VirtualHost> # -# You also need to enable cgi files to run as CGI scripts. For example: +# Alias /admin/ /home/yourname/fixmystreet/web-admin/ +# +# Alias /jslib/ "/home/yourname/fixmystreet/commonlib/jslib/" +# +# </VirtualHost> # -# Options +ExecCGI -# AddHandler cgi-script .cgi # -# Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. -# Email: francis@mysociety.org; WWW: http://www.mysociety.org +# Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. Email: +# francis@mysociety.org; WWW: http://www.mysociety.org # # $Id: httpd.conf,v 1.40 2009-10-21 15:22:36 louise Exp $ @@ -46,14 +62,15 @@ RewriteRule ^/[Tt]/([0-9A-Za-z]{16,18}).*$ /tms-signup.cgi?token=$1 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/([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] +RewriteRule ^/rss/pc/(.*)/([0-9]+)$ /rss.cgi?type=local_problems;pc=$1;d=$2 [QSA] +RewriteRule ^/rss/pc/(.*)$ /rss.cgi?type=local_problems;pc=$1 [QSA] +RewriteRule ^/rss/problems$ /rss.cgi?type=new_problems [QSA] # RSS feeds for voting areas RewriteRule ^/rss/council/([0-9]+)$ /rss/reports/$1 [R=permanent] @@ -77,7 +94,7 @@ RewriteRule ^/alerts/?$ /alert [R=permanent] RewriteRule ^/json/problems/new$ /json.cgi?type=new_problems [QSA] RewriteRule ^/json/problems/fixed$ /json.cgi?type=fixed_problems [QSA] -ProxyPass /tilma/ http://tilma.mysociety.org/ +ProxyPass /tilma/ http://tilma.mysociety.org/ ProxyPassReverse /tilma/ http://tilma.mysociety.org/ # CGI files can be referred without CGI diff --git a/conf/packages b/conf/packages index bbdb4aa29..b8324300d 100644 --- a/conf/packages +++ b/conf/packages @@ -26,4 +26,6 @@ libjson-perl libimage-size-perl libmath-bigint-gmp-perl libtext-template-perl -gettext
\ No newline at end of file +gettext +libtest-exception-perl +libhaml-ruby |