etc/nginx/inc/https-only.conf

diff --git a/etc/nginx/inc/https-only.conf b/etc/nginx/inc/https-only.conf
index 9618519d0049a63c1b3252e04caac4a4f6b08791..280ca455e93014f3025d34797c0c57a2546f5f65 100644 (file)
--- a/etc/nginx/inc/https-only.conf
+++ b/etc/nginx/inc/https-only.conf
@@ -1,5 +1,9 @@
-set $redirect 0;
-if ( $scheme = http ) { set $redirect 1; }
+set $_https_only 0;
+if ( $scheme = http ) { set $_https_only 1; }
 # Live is behind a load balancer which do only http queries
-if ($http_x_forwarded_proto = "https") { set $redirect 0; }
-if ( $redirect = 1 ) { return 301 https://$host$request_uri; }
+if ($http_x_forwarded_proto = "https") { set $_https_only 0; }
+
+if ( $https_only = "") { set $https_only ""; }
+if ( $https_only != "") { set $_https_only $https_only; }
+
+if ( $_https_only = 1 ) { return 301 https://$host$request_uri; }