aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-07-17 11:28:35 +0100
committerGareth Rees <gareth@mysociety.org>2014-07-17 11:28:35 +0100
commit9fe90fb0fe2fa0aabd217700b071197f44c2adde (patch)
treea12154194cf15229835365bb5f42909befb3c874
parent7cb0154486f61c9eebc8f8495887bf85a99d39fc (diff)
Comment out forced redirect to HTTPS
Only need this if FORCE_SSL: true is set
-rw-r--r--config/httpd-vhost.conf-example7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/httpd-vhost.conf-example b/config/httpd-vhost.conf-example
index 8895f1531..a01f58089 100644
--- a/config/httpd-vhost.conf-example
+++ b/config/httpd-vhost.conf-example
@@ -44,8 +44,11 @@
RewriteEngine On
# Rewrite all proxied HTTP requests to HTTPS.
- RewriteCond %{HTTP:X-Forwarded-Proto} !https
- RewriteRule /(.*) https://www.example.com/$1 [L,R=permanent]
+ # Uncomment the following two lines if you have set `FORCE_SSL: true` in
+ # general.yml:
+ # ---
+ # RewriteCond %{HTTP:X-Forwarded-Proto} !https
+ # RewriteRule /(.*) https://www.example.com/$1 [L,R=permanent]
# TODO: do we need this now we use Passenger?
# Pass through the HTTP basic authentication to mongrel. See also