diff options
| -rw-r--r-- | config/httpd.conf | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/config/httpd.conf b/config/httpd.conf index 2aca05712..e08de4c71 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.27 2009-07-15 09:06:37 francis Exp $ +# $Id: httpd.conf,v 1.28 2009-08-01 14:08:27 francis Exp $ # This is needed for the PHP spell checker <Location /fcgi> @@ -15,16 +15,10 @@ </Location> RewriteEngine On -RewriteLog /var/log/apache2/rewrite.log -RewriteLogLevel 9 - -# 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] +#RewriteLog /var/log/apache2/rewrite.log +#RewriteLogLevel 9 +# XXX do we need this now we use Passenger? # Pass through the HTTP basic authentication to mongrel. See also # admin_http_auth_user in app/controllers/application.rb # Note: Apache 2 only. Doesn't work in Apache 1.3, you'll need to live without @@ -40,36 +34,3 @@ RewriteRule /([^.]*)$ /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 %{DOCUMENT_ROOT}%{REQUEST_URI} !-f -# RewriteRule ^/(.*) http://localhost:3000/$1 [P] - -<Location /admin/balancer-manager> - SetHandler balancer-manager -</Location> - -# Configuration for proxying to mongrel using foimongreld.ugly -#<Proxy balancer://foicluster> -## If adding new ones, launch extra mongrels in foimongreld.ugly also -#BalancerMember http://localhost:3000 -#BalancerMember http://localhost:3001 -#BalancerMember http://localhost:3002 -#BalancerMember http://localhost:3003 -#BalancerMember http://localhost:3004 -#BalancerMember http://localhost:3005 -#BalancerMember http://localhost:3006 -#BalancerMember http://localhost:3007 -## really should be lbmethod=bybusyness, but we don't have that algorithm yet. -## If it becomes a problem, upgrade or patch Apache with it. See: -## see http://labs.reevoo.com/2008/8/19/bybusy-mod-accepted-by-apache -#ProxySet lbmethod=byrequests -#</Proxy> -#ProxyPass /jslib ! -#ProxyPass /fcgi ! -#ProxyPass /files ! -#ProxyPass /down ! -#ProxyPass /down.html ! -#ProxyPass /admin/balancer-manager ! -#ProxyPass / balancer://foicluster/ - - |