diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf index b8c0132ef..e00c0a7dc 100644 --- a/reverse-proxy/conf.d.dev/default.conf +++ b/reverse-proxy/conf.d.dev/default.conf @@ -5,8 +5,8 @@ server { location ^~ /api/archival/ { rewrite ^/api/archival/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $archivalApi archival-api; - proxy_pass http://$archivalApi:80; + set $upstream "archival-api"; + proxy_pass http://$upstream: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; } @@ -14,8 +14,8 @@ server { location ^~ /api/directory/ { rewrite ^/api/directory/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $directoryApi directory-api; - proxy_pass http://$directoryApi:80; + set $upstream "directory-api"; + proxy_pass http://$upstream: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; } @@ -23,8 +23,8 @@ server { location ^~ /api/ { rewrite ^/api/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $apiDocs api-docs; - proxy_pass http://$apiDocs:8080; + set $upstream "api-docs"; + proxy_pass http://$upstream: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 50b10f4e4..512d326bd 100644 --- a/reverse-proxy/conf.d/default.conf +++ b/reverse-proxy/conf.d/default.conf @@ -8,8 +8,8 @@ server { location ^~ /api/archival/ { rewrite ^/api/archival/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $archivalApi archival-api; - proxy_pass http://$archivalApi:80; + set $upstream "archival-api"; + proxy_pass http://$upstream: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; } @@ -17,8 +17,8 @@ server { location ^~ /api/directory/ { rewrite ^/api/directory/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $directoryApi directory-api; - proxy_pass http://$directoryApi:80; + set $upstream "directory-api"; + proxy_pass http://$upstream: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; } @@ -26,16 +26,16 @@ server { location ^~ /api/ { rewrite ^/api/(.*)$ /$1 break; resolver 127.0.0.11 valid=30s; - set $apiDocs api-docs; - proxy_pass http://$apiDocs:8080; + set $upstream "api-docs"; + proxy_pass http://$upstream: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; } location / { resolver 127.0.0.11 valid=30s; - set $web web; - proxy_pass http://$web:80; + set $upstream "web"; + proxy_pass http://$upstream:80; 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'; style-src 'self'; img-src 'self' data:; manifest-src 'self';" always; }