From 6f61cc8c35597c509bdbd955ee36aa0c82b0047e Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Thu, 30 Jun 2022 12:09:45 +0200
Subject: [PATCH] Update ingress.conf

---
 .../rootfs/etc/nginx/servers/ingress.conf     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf
index 0ba4c1897..32dc1d26b 100644
--- a/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf
+++ b/tandoor_recipes/rootfs/etc/nginx/servers/ingress.conf
@@ -9,8 +9,8 @@ server
   location /
   {
     # Security
-        allow   172.30.32.2;
-        deny    all;
+        allow                   172.30.32.2;
+        deny                    all;
 
     # Base
         proxy_bind              $server_addr;
@@ -24,6 +24,11 @@ server
         proxy_set_header        X-Script-Name           %%ingress_entry%%;  # IMPORTANT: path has NO trailing slash
         proxy_cookie_path       /                       %%ingress_entry%%/;
 
+    # Allow iframe
+        proxy_hide_header       X-Frame-Options;
+        add_header              Access-Control-Allow-Origin *;
+        proxy_set_header        Accept-Encoding         "";
+
     # Avoid mixed contents
         if ($http_referer ~* "^(http[s]?)://([^:]+):(\d*)(/.*)$")
         {
@@ -37,9 +42,9 @@ server
           set $x_host $2;
           set $x_port "";
         }
-        proxy_set_header X-Scheme $x_scheme;
-        proxy_redirect http://$host/ $x_scheme://$x_host$x_port/;
-        proxy_redirect $x_scheme://$host/ $x_scheme://$x_host$x_port/;
+        proxy_set_header         X-Scheme                 $x_scheme;
+        proxy_redirect           http://$host/            $x_scheme://$x_host$x_port/;
+        proxy_redirect           $x_scheme://$host/       $x_scheme://$x_host$x_port/;
 
     # Rewrite url
         sub_filter_once off;
@@ -49,11 +54,6 @@ server
         #sub_filter "/view" "%%ingress_entry%%/view";
         #sub_filter "/search" "%%ingress_entry%%/search";
         #sub_filter "/edit/" "%%ingress_entry%%/edit/";
-        
-     # Allow iframe
-        proxy_hide_header X-Frame-Options;
-        add_header Access-Control-Allow-Origin *;
-        proxy_set_header Accept-Encoding "";
 
     # Tests
         #proxy_set_header X-Real-IP $remote_addr;