diff options
| -rw-r--r-- | config/httpd.conf | 8 | ||||
| -rw-r--r-- | config/vhost.conf | 24 |
2 files changed, 7 insertions, 25 deletions
diff --git a/config/httpd.conf b/config/httpd.conf index 7be8a3014..c8b6f95fc 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -6,7 +6,13 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.10 2008-06-02 11:03:33 francis Exp $ +# $Id: httpd.conf,v 1.11 2008-06-04 18:29:02 francis Exp $ + +# This is needed for the PHP spell checker +<Location /fcgi> + Options +ExecCGI + SetHandler fastcgi-script +</Location> RewriteEngine On #RewriteLog /var/log/apache/rewrite.log diff --git a/config/vhost.conf b/config/vhost.conf deleted file mode 100644 index 1317f02c0..000000000 --- a/config/vhost.conf +++ /dev/null @@ -1,24 +0,0 @@ -RewriteEngine On -RewriteLog /var/log/apache2/rewrite.log -RewriteLogLevel 3 - -# Make a file down.html in the DocumentRoot bring down the whole site and -# display itself. -RewriteCond %{DOCUMENT_ROOT}/down.html -s -RewriteRule /(.+).cgi /down.html [R] -RewriteCond %{DOCUMENT_ROOT}/down.html !-s -RewriteRule /down.html / [R] - -# Use Mongrel as the main webserver (more reliable than FastCGI for Rails) -RewriteCond %{REQUEST_URI} !^/jslib/ -RewriteCond %{REQUEST_URI} !^/fcgi/ -RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f -RewriteRule ^/(.*) http://localhost:3000/$1 [P] -# This is roughly equivalent to ProxyPass, but lets Apache serve the static files. -# ProxyPass / http://localhost:3000/ - -# Pass through the HTTP basic authentication to mongrel -# sigh - doesn't work in apache 1.3 -#RewriteCond %{LA-U:REMOTE_USER} (.+) -#RewriteRule . - [E=RU:%1] -#RequestHeader add X-Forwarded-User %{RU}e |