Do a better job of handling sitename.com and www.sitename.com

perlDreamer · perlDreamer · commit 44e3705f923b · 2012-01-08T09:10:50.000-08:00
diff --git a/wre/var/setupfiles/nginx.template b/wre/var/setupfiles/nginx.template
@@ -1,5 +1,11 @@
+##Force all domain requests, mysite.com, to go to www.mysite.com
 server {
-    server_name  [% sitename %] [%domain %];
+    server_name [% domain %];
+    rewrite ^ $scheme://[% sitename %]$request_uri redirect;
+}
+
+server {
+    server_name  [% sitename %];
 
     listen   [% config.get('nginx/port') %]; ## listen for ipv4
 
@@ -58,17 +64,15 @@ server {
 #        proxy_set_header Host $host;
 #        proxy_pass   http://127.0.0.1:[% config.get('starman/port') %];
 #    }
-#    location /uploads {
-#        expires 2h;
-#        if ( $request_filename ~ "^(.*/)" ) {
-#            set $request_directory $document_root$1;
-#        }
-#        if ( -f "$request_directory/.wgaccess" ) {
-#             proxy_pass   http://127.0.0.1:[% config.get('starman/port') %];
-#        }
+#
+#    location /extras/ {
+#        add_header Cache-Control public;
+#        expires 24h;
+#        root   /data/WebGUI/www/extras;
+#        add_header Access-Control-Allow-Origin *;
 #    }
+#
 #    location /uploads/filepump { expires max; }
-#    location /extras/      { expires 24h; }
 #    location = /default.ida    { access_log off; deny all; }
 #    location /_vti_bin     { access_log off; deny all; }
 #    location /_mem_bin     { access_log off; deny all; }
