work-in-progress fixes for mediagoblin

1 files changed, 16 insertions, 8 deletions

diff --git a/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2 b/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
index 817f02c..8705d0f 100644
--- a/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
+++ b/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
@@ -37,14 +37,22 @@ server {
         alias /srv/mediagoblin.example.org/mediagoblin/user_dev/plugin_static/;
     }
 
-    # Mounting MediaGoblin itself via FastCGI.
+#    # Mounting MediaGoblin itself via FastCGI.
+#    location / {
+#        fastcgi_pass 127.0.0.1:26543;
+#        include /etc/nginx/fastcgi_params;
+#
+#        # our understanding vs nginx's handling of script_name vs
+#        # path_info don't match :)
+#        fastcgi_param PATH_INFO $fastcgi_script_name;
+#        fastcgi_param SCRIPT_NAME "";
+#    }
+
+    # Until FastCGI works, just do a proxy pass
     location / {
-        fastcgi_pass 127.0.0.1:26543;
-        include /etc/nginx/fastcgi_params;
-
-        # our understanding vs nginx's handling of script_name vs
-        # path_info don't match :)
-        fastcgi_param PATH_INFO $fastcgi_script_name;
-        fastcgi_param SCRIPT_NAME "";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://127.0.0.1:26543;
     }
 }