From 679565337171f173ce8ecff9f6cebf6dc09c4717 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 23 Jan 2021 14:38:33 -0600 Subject: [PATCH] =?UTF-8?q?refactor(reverse-proxy):=20=F0=9F=8E=A8=20tidy?= =?UTF-8?q?=20alignment=20of=20location=20configs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reverse-proxy/conf.d.dev/default.conf | 18 +++++++++--------- reverse-proxy/conf.d/default.conf | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf index 8a12c61ff..0eb30ad44 100644 --- a/reverse-proxy/conf.d.dev/default.conf +++ b/reverse-proxy/conf.d.dev/default.conf @@ -4,20 +4,20 @@ server { add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always; location ^~ /api/archival/ { - rewrite ^/api/archival/(.*)$ /$1 break; - proxy_pass http://archival-api:80; - include loc-includes/*; + rewrite ^/api/archival/(.*)$ /$1 break; + proxy_pass http://archival-api:80; + include loc-includes/*; } location ^~ /api/directory/ { - rewrite ^/api/directory/(.*)$ /$1 break; - proxy_pass http://directory-api:80; - include loc-includes/*; + rewrite ^/api/directory/(.*)$ /$1 break; + proxy_pass http://directory-api:80; + include loc-includes/*; } location ^~ /api/ { - rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://api-docs:8080; - include loc-includes/*; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass http://api-docs:8080; + include loc-includes/*; } } \ No newline at end of file diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf index e8f9186c6..bf5120218 100644 --- a/reverse-proxy/conf.d/default.conf +++ b/reverse-proxy/conf.d/default.conf @@ -7,26 +7,26 @@ server { add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' validator.swagger.io data:; manifest-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; base-uri 'none'; form-action 'none'; frame-ancestors 'none';" always; location ^~ /api/archival/ { - rewrite ^/api/archival/(.*)$ /$1 break; - proxy_pass http://archival-api:80; - include loc-includes/*; + rewrite ^/api/archival/(.*)$ /$1 break; + proxy_pass http://archival-api:80; + include loc-includes/*; } location ^~ /api/directory/ { - rewrite ^/api/directory/(.*)$ /$1 break; - proxy_pass http://directory-api:80; - include loc-includes/*; + rewrite ^/api/directory/(.*)$ /$1 break; + proxy_pass http://directory-api:80; + include loc-includes/*; } location ^~ /api/ { - rewrite ^/api/(.*)$ /$1 break; - proxy_pass http://api-docs:8080; - include loc-includes/*; + rewrite ^/api/(.*)$ /$1 break; + proxy_pass http://api-docs:8080; + include loc-includes/*; } location / { - proxy_pass http://web:80; - include loc-includes/*; + proxy_pass http://web:80; + include loc-includes/*; } }