correct nginx rule forwarding header

discourse · Jan 9, 2014 · 1b8a32b · 1b8a32b
1 parent d4cc367
commit 1b8a32b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
@@ -16,6 +16,13 @@ upstream discourse {
 #   server unix:/var/www/discourse/tmp/sockets/puam.sock;
 # }
 
+
+# attempt to preserve the proto, must be in http context
+map $http_x_forwarded_proto $thescheme {
+  default $scheme;
+  https https;
+}
+
 server {
 
   listen 80;
@@ -88,11 +95,6 @@ server {
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-    # attempt to preserve the proto
-    map $http_x_forwarded_proto $thescheme {
-      default $scheme;
-      https https;
-    }
 
     proxy_set_header X-Forwarded-Proto $thescheme;
     proxy_set_header Host $http_host;

diff --git a/script/bench.rb b/script/bench.rb
@@ -162,8 +162,7 @@ def bench(path)
   append = "?api_key=#{api_key}&api_username=admin1"
 
   # asset precompilation is a dog, wget to force it
-  run "wget http://127.0.0.1:#{@port}/ -o test.html"
-  `rm test.html`
+  run "wget http://127.0.0.1:#{@port}/ -o /dev/null"
 
   tests = [
     ["home", "/"],