From 65bd15edf0aab1c66dbf7a7b324f0afcefe1f5a5 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 30 Oct 2021 11:38:28 -0500 Subject: [PATCH] =?UTF-8?q?fix(nginx):=20=F0=9F=9A=91=F0=9F=90=9B=20upstre?= =?UTF-8?q?am=20vars?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reverse-proxy/conf.d.dev/default.conf | 6 +++--- reverse-proxy/conf.d/default.conf | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf index 52a3e31c7..fd464a2f4 100644 --- a/reverse-proxy/conf.d.dev/default.conf +++ b/reverse-proxy/conf.d.dev/default.conf @@ -3,27 +3,27 @@ server { include server-includes/*; location ^~ /api/archival/ { - rewrite ^/api/archival/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $archival_api "archival-api"; + rewrite ^/api/archival/(.*)$ /$1 break; proxy_pass http://$archival_api:80; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always; } location ^~ /api/directory/ { - rewrite ^/api/directory/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $directory_api "directory-api"; + rewrite ^/api/directory/(.*)$ /$1 break; proxy_pass http://$directory_api:80; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always; } location ^~ /api/ { - rewrite ^/api/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $api_docs "api-docs"; + rewrite ^/api/(.*)$ /$1 break; proxy_pass http://$api_docs:8080; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; connect-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' validator.swagger.io data:;" always; diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf index da0ac8cad..044addb86 100644 --- a/reverse-proxy/conf.d/default.conf +++ b/reverse-proxy/conf.d/default.conf @@ -6,27 +6,27 @@ server { ssl_certificate_key /etc/nginx/cert/filterlists_key.pem; location ^~ /api/archival/ { - rewrite ^/api/archival/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $archival_api "archival-api"; + rewrite ^/api/archival/(.*)$ /$1 break; proxy_pass http://$archival_api:80; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always; } location ^~ /api/directory/ { - rewrite ^/api/directory/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $directory_api "directory-api"; + rewrite ^/api/directory/(.*)$ /$1 break; proxy_pass http://$directory_api:80; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none';" always; } location ^~ /api/ { - rewrite ^/api/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; set $api_docs "api-docs"; + rewrite ^/api/(.*)$ /$1 break; proxy_pass http://$api_docs:8080; include location-includes/*; add_header Content-Security-Policy "upgrade-insecure-requests; default-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'none'; connect-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' validator.swagger.io data:;" always;