From c775aa2406851ecbe6025e69710b21eb2f013494 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Fri, 10 Nov 2023 17:23:27 +0100 Subject: [PATCH] Rename directive add_header -> more_set_header --- nginx.conf | 2 +- sites-available/000-default.conf | 9 ++++---- sites-available/planetposen.conf | 36 +++++++++++--------------------- snippets/proxy-params.conf | 2 +- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/nginx.conf b/nginx.conf index 59f0e4d..e5c9e7b 100644 --- a/nginx.conf +++ b/nginx.conf @@ -35,7 +35,7 @@ http { # Headers # ################## - add_header X-Web-Entry "Bifrost" always; + more_set_header 'X-Web-Entry Bifrost'; ################## # SSL settings # diff --git a/sites-available/000-default.conf b/sites-available/000-default.conf index 5c90913..546f24c 100644 --- a/sites-available/000-default.conf +++ b/sites-available/000-default.conf @@ -10,8 +10,8 @@ server { server_name _; - add_header X-Dead-End true; - add_header Content-Type text/plain; + more_set_header 'X-Dead-End true'; + more_set_header 'Content-Type text/plain'; return 200 ok; } @@ -24,8 +24,9 @@ server { server_name _; - add_header X-Dead-End true; - add_header Content-Type text/plain; + more_set_header 'X-Dead-End true'; + more_set_header 'Content-Type text/plain'; + return 425 "SSL not supported here."; ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; diff --git a/sites-available/planetposen.conf b/sites-available/planetposen.conf index 03299a1..f0410d5 100644 --- a/sites-available/planetposen.conf +++ b/sites-available/planetposen.conf @@ -24,7 +24,7 @@ server { server_name planetposen.no planet.schleppe.cloud; - add_header Upgrading Connection; + more_set_header Upgrading Connection; return 302 https://$host$request_uri; } @@ -49,6 +49,8 @@ server { server_name planet.schleppe.cloud; + include snippets/proxy-params.conf; + location /ws { resolver 10.0.0.72; proxy_pass http://planetposen-ws; @@ -56,23 +58,17 @@ server { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } location /api/v1/images { resolver 10.0.0.72; proxy_pass http://planetposen-images/api/v1/images; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_request_buffering off; - add_header 'Access-Control-Allow-Origin' 'planet.schleppe.cloud'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'Content-Type'; + more_set_header 'Access-Control-Allow-Origin planet.schleppe.cloud'; + more_set_header 'Access-Control-Allow-Methods GET, POST, OPTIONS'; + more_set_header 'Access-Control-Allow-Headers Content-Type'; client_max_body_size 5M; } @@ -81,27 +77,19 @@ server { resolver 10.0.0.72; proxy_pass http://planetposen-backend/api; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # add_header 'Access-Control-Allow-Origin' 'planet.schleppe.cloud'; - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'Content-Type'; + more_set_header 'Access-Control-Allow-Origin *'; + more_set_header 'Access-Control-Allow-Methods GET, POST, OPTIONS'; + more_set_header 'Access-Control-Allow-Headers Content-Type'; } location / { resolver 10.0.0.72; proxy_pass http://planetposen-frontend; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - add_header 'Access-Control-Allow-Origin' 'planet.schleppe.cloud'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; - add_header 'Access-Control-Allow-Headers' 'Content-Type'; + more_set_header 'Access-Control-Allow-Origin planet.schleppe.cloud'; + more_set_header 'Access-Control-Allow-Methods GET, POST, OPTIONS'; + more_set_header 'Access-Control-Allow-Headers Content-Type'; } ssl_certificate /etc/letsencrypt/live/planet.schleppe.cloud/fullchain.pem; # managed by Certbot diff --git a/snippets/proxy-params.conf b/snippets/proxy-params.conf index 75d3c81..19ddff1 100644 --- a/snippets/proxy-params.conf +++ b/snippets/proxy-params.conf @@ -3,4 +3,4 @@ proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header Host $host; -add_header X-Proxy-Params Applied always; \ No newline at end of file +more_set_header 'X-Proxy-Params Applied';