From 1fdcb2ab13836d21dd450c92746a936212d55dfb Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 3 Oct 2020 12:29:23 -0500 Subject: [PATCH] =?UTF-8?q?refactor(reverse-proxy):=20=E2=99=BB=20rm=20com?= =?UTF-8?q?mented=20archival-api=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- reverse-proxy/conf.d.dev/default.conf | 14 +------------- reverse-proxy/conf.d/default.conf | 12 ------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf index c78dfcfd9..84922ade6 100644 --- a/reverse-proxy/conf.d.dev/default.conf +++ b/reverse-proxy/conf.d.dev/default.conf @@ -1,18 +1,6 @@ server { listen 80 default_server; - # location ^~ /api/archival/ { - # rewrite ^/api/archival/(.*)$ /$1 break; - # proxy_pass http://archival-api:80; - # proxy_http_version 1.1; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection keep-alive; - # proxy_set_header Host $host; - # proxy_cache_bypass $http_upgrade; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # } - location ^~ /api/ { rewrite ^/api/(.*)$ /$1 break; proxy_pass http://directory-api:80; @@ -24,4 +12,4 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } -} \ No newline at end of file +} \ No newline at end of file diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf index 36017b443..db17d3e65 100644 --- a/reverse-proxy/conf.d/default.conf +++ b/reverse-proxy/conf.d/default.conf @@ -8,18 +8,6 @@ server { ssl_certificate_key /etc/nginx/cert/filterlists_key.pem; add_header Content-Security-Policy "default-src 'none'; connect-src 'self'; img-src 'self' 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; - # proxy_http_version 1.1; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection keep-alive; - # proxy_set_header Host $host; - # proxy_cache_bypass $http_upgrade; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # } location ^~ /api/ { rewrite ^/api/(.*)$ /$1 break;