Merge pull request #3454 from mboersma/use-nginx-host-https

mboersma · mboersma · commit bd8b2dff4b03 · 2015-04-10T15:27:04.000-06:00
fix(router): use nginx $host in HTTPS redirects
diff --git a/router/image/templates/nginx.conf b/router/image/templates/nginx.conf
@@ -98,7 +98,7 @@ http {
 
         {{ if eq $enforceHTTPS "true" }}
         if ($access_scheme != "https") {
-          return 301 https://$server_name$request_uri;
+          return 301 https://$host$request_uri;
         }
         {{ end }}
     }
@@ -195,7 +195,7 @@ http {
 
             {{ if eq $enforceHTTPS "true" }}
             if ($access_scheme != "https") {
-              return 301 https://$server_name$request_uri;
+              return 301 https://$host$request_uri;
             }
             {{ end }}
 
@@ -245,7 +245,7 @@ http {
 
             {{ if eq $enforceHTTPS "true" }}
             if ($access_scheme != "https") {
-              return 301 https://$server_name$request_uri;
+              return 301 https://$host$request_uri;
             }
             {{ end }}
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ http {`
`98`	`98`
`99`	`99`	`{{ if eq $enforceHTTPS "true" }}`
`100`	`100`	`if ($access_scheme != "https") {`
`101`		`- return 301 https://$server_name$request_uri;`
	`101`	`+ return 301 https://$host$request_uri;`
`102`	`102`	`}`
`103`	`103`	`{{ end }}`
`104`	`104`	`}`
`@@ -195,7 +195,7 @@ http {`
`195`	`195`
`196`	`196`	`{{ if eq $enforceHTTPS "true" }}`
`197`	`197`	`if ($access_scheme != "https") {`
`198`		`- return 301 https://$server_name$request_uri;`
	`198`	`+ return 301 https://$host$request_uri;`
`199`	`199`	`}`
`200`	`200`	`{{ end }}`
`201`	`201`
`@@ -245,7 +245,7 @@ http {`
`245`	`245`
`246`	`246`	`{{ if eq $enforceHTTPS "true" }}`
`247`	`247`	`if ($access_scheme != "https") {`
`248`		`- return 301 https://$server_name$request_uri;`
	`248`	`+ return 301 https://$host$request_uri;`
`249`	`249`	`}`
`250`	`250`	`{{ end }}`
`251`	`251`