Merge branch 'nginx-ssl' into rails-3-develop

1 files changed, 7 insertions, 0 deletions

diff --git a/config/nginx-ssl.conf.example b/config/nginx-ssl.conf.example
index c623c8e96..cdb89ef05 100644
--- a/config/nginx-ssl.conf.example
+++ b/config/nginx-ssl.conf.example
@@ -2,6 +2,13 @@ upstream alaveteli {
     server 127.0.0.1:3000;
 }
 
+# Redirect any http:// request to https://www.example.com
+server {
+  listen 80;
+  server_name www.example.com;
+  rewrite ^(.*) https://www.example.com$request_uri permanent;
+}
+
 server {
     listen 443;
     server_name www.example.com;