Merge pull request openedx-unsupported#2689 from edx/arbab/fix-nginx-with-elif

arbabnazar · arbabnazar · commit ec6c027b7f74 · 2016-01-12T23:29:01.000+05:00
use the elif instead of second if statement
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/analytics_api.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/analytics_api.j2
@@ -16,8 +16,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+ 
+    {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/cms.j2
@@ -51,8 +51,8 @@ error_page {{ k }} {{ v }};
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/credentials.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/credentials.j2
@@ -52,19 +52,29 @@ location @proxy_to_app {
     proxy_redirect off;
     proxy_pass http://credentials_app_server;
   }
-{% if NGINX_SET_X_FORWARDED_HEADERS %}
-   if ($scheme != "https") {
-    rewrite ^ https://$host$uri permanent;
-   }
- {% else %}
-  # Forward to HTTPS if we're an HTTP request...
-  if ($http_x_forwarded_proto = "http") {
-    set $do_redirect "true";
+  # Nginx does not support nested condition or or conditions so
+  # there is an unfortunate mix of conditonals here.
+  {% if NGINX_REDIRECT_TO_HTTPS %}
+     {% if NGINX_HTTPS_REDIRECT_STRATEGY == "scheme" %}
+  # Redirect http to https over single instance
+  if ($scheme != "https") 
+  { 
+   set $do_redirect_to_https "true";
   }
+ 
+    {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
-  # Run our actual redirect...
-  if ($do_redirect = "true") {
-    rewrite ^ https://$host$request_uri? permanent;
+  # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
+  if ($http_x_forwarded_proto = "http") 
+  {
+   set $do_redirect_to_https "true";
   }
- {% endif %}
+     {% endif %}
+
+  # Execute the actual redirect
+  if ($do_redirect_to_https = "true")
+  {
+  rewrite ^ https://$host$request_uri? permanent;
+  }
+  {% endif %}
 }
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/ecommerce.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/ecommerce.j2
@@ -39,8 +39,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
   {
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/edx_notes_api.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/edx_notes_api.j2
@@ -16,8 +16,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+  
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/insights.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/insights.j2
@@ -42,8 +42,8 @@ location @proxy_to_app {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/kibana.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/kibana.j2
@@ -32,8 +32,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms-preview.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms-preview.j2
@@ -85,8 +85,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/lms.j2
@@ -71,8 +71,8 @@ error_page {{ k }} {{ v }};
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 
diff --git a/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/programs.j2 b/playbooks/roles/nginx/templates/edx/app/nginx/sites-available/programs.j2
@@ -40,8 +40,8 @@ server {
   { 
    set $do_redirect_to_https "true";
   }
-     {% endif %}
-  {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
+
+     {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}
 
   # Forward to HTTPS if we're an HTTP request... and the server is behind ELB 
   if ($http_x_forwarded_proto = "http") 

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ server {`
`16`	`16`	`{`
`17`	`17`	`set $do_redirect_to_https "true";`
`18`	`18`	`}`
`19`		`- {% endif %}`
`20`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`19`	`+`
	`20`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`21`	`21`
`22`	`22`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`23`	`23`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ error_page {{ k }} {{ v }};`
`51`	`51`	`{`
`52`	`52`	`set $do_redirect_to_https "true";`
`53`	`53`	`}`
`54`		`- {% endif %}`
`55`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`54`	`+`
	`55`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`56`	`56`
`57`	`57`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`58`	`58`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ server {`
`39`	`39`	`{`
`40`	`40`	`set $do_redirect_to_https "true";`
`41`	`41`	`}`
`42`		`- {% endif %}`
`43`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`42`	`+`
	`43`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`44`	`44`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`45`	`45`	`if ($http_x_forwarded_proto = "http")`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ location @proxy_to_app {`
`42`	`42`	`{`
`43`	`43`	`set $do_redirect_to_https "true";`
`44`	`44`	`}`
`45`		`- {% endif %}`
`46`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`45`	`+`
	`46`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`47`	`47`
`48`	`48`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`49`	`49`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ server {`
`32`	`32`	`{`
`33`	`33`	`set $do_redirect_to_https "true";`
`34`	`34`	`}`
`35`		`- {% endif %}`
`36`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`35`	`+`
	`36`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`37`	`37`
`38`	`38`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`39`	`39`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ server {`
`85`	`85`	`{`
`86`	`86`	`set $do_redirect_to_https "true";`
`87`	`87`	`}`
`88`		`- {% endif %}`
`89`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`88`	`+`
	`89`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`90`	`90`
`91`	`91`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`92`	`92`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ error_page {{ k }} {{ v }};`
`71`	`71`	`{`
`72`	`72`	`set $do_redirect_to_https "true";`
`73`	`73`	`}`
`74`		`- {% endif %}`
`75`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`74`	`+`
	`75`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`76`	`76`
`77`	`77`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`78`	`78`	`if ($http_x_forwarded_proto = "http")`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ server {`
`40`	`40`	`{`
`41`	`41`	`set $do_redirect_to_https "true";`
`42`	`42`	`}`
`43`		`- {% endif %}`
`44`		`- {% if NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
	`43`	`+`
	`44`	`+ {% elif NGINX_HTTPS_REDIRECT_STRATEGY == "forward_for_proto" %}`
`45`	`45`
`46`	`46`	`# Forward to HTTPS if we're an HTTP request... and the server is behind ELB`
`47`	`47`	`if ($http_x_forwarded_proto = "http")`