Merge pull request #33 from Ph3nol/fixes

Nginx vhosts headers update
Ph3nol · May 29, 2018 · 85efecc · 85efecc
2 parents 18e1157 + d6a8bbe
commit 85efecc
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 20 deletions.
diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/atmo.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/atmo.conf.twig
@@ -8,12 +8,17 @@ server {
     location / {
         proxy_pass http://{{ forService.identifier }}:1337;
 
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With' always;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With,X-IODevice-Token';
+            add_header 'Access-Control-Allow-Origin' "$http_origin";
+
             return 204;
         }
     }

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/cerebro.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/cerebro.conf.twig
@@ -8,12 +8,17 @@ server {
     location / {
         proxy_pass http://{{ forService.identifier }}:9000;
 
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With' always;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With,X-IODevice-Token';
+            add_header 'Access-Control-Allow-Origin' "$http_origin";
+
             return 204;
         }
     }

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/nodejs.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/nodejs.conf.twig
@@ -9,12 +9,17 @@ server {
     location / {
         proxy_pass http://{{ forService.identifier }}:9000;
 
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With' always;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With,X-IODevice-Token';
+            add_header 'Access-Control-Allow-Origin' "$http_origin";
+
             return 204;
         }
     }

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/php-symfony.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/php-symfony.conf.twig
@@ -22,12 +22,17 @@ server {
         fastcgi_param HTTPS off;
         fastcgi_param REMOTE_ADDR 127.0.0.1;
 
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With' always;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With,X-IODevice-Token';
+            add_header 'Access-Control-Allow-Origin' "$http_origin";
+
             return 204;
         }
     }

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/php.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/php.conf.twig
@@ -22,12 +22,17 @@ server {
         fastcgi_param HTTPS off;
         fastcgi_param REMOTE_ADDR 127.0.0.1;
 
-        add_header 'Access-Control-Allow-Origin' "$http_origin" always;
-        add_header 'Access-Control-Allow-Credentials' 'true' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With' always;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
 
         if ($request_method = 'OPTIONS') {
+            add_header 'Access-Control-Allow-Credentials' 'true';
+            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
+            add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Mx-ReqToken,X-Requested-With,X-IODevice-Token';
+            add_header 'Access-Control-Allow-Origin' "$http_origin";
+
             return 204;
         }
     }