diff options
| -rw-r--r-- | conf/httpd.conf | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/conf/httpd.conf b/conf/httpd.conf index 1e6b8979e..e3f8e5c06 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -1,24 +1,30 @@ -# 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 th 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> -# Alias /admin/ /home/francis/devel/fixmystreet/web-admin/ +# +# Alias /admin/ /home/yourname/fixmystreet/web-admin/ +# # </VirtualHost> # -# You also need to enable cgi files to run as CGI scripts. For example: -# -# 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 $ @@ -77,7 +83,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 |