Merge pull request #129 from appirio-tech/dev

thabofletcher · thabofletcher · commit 14f289d01ba1 · 2015-07-13T17:16:54.000-07:00
Release dev to qa
diff --git a/src/conf/tc-prod-nginx.conf b/src/conf/tc-prod-nginx.conf
@@ -9,7 +9,7 @@ server {
 	listen [::]:8080 default_server ipv6only=on;
 
 	if ($http_x_forwarded_proto != "https") {
-        return 301 https://$server_name$request_uri;
+        return 301 https://$http_host$request_uri;
    	}
 
    	set $root_base /home/ubuntu/tc-site;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ server {`
`9`	`9`	`listen [::]:8080 default_server ipv6only=on;`
`10`	`10`
`11`	`11`	`if ($http_x_forwarded_proto != "https") {`
`12`		`- return 301 https://$server_name$request_uri;`
	`12`	`+ return 301 https://$http_host$request_uri;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`set $root_base /home/ubuntu/tc-site;`