Merge pull request #2 from KevinMidboe/feat/more_set_headers

Feat/more set headers
This commit is contained in:
2023-11-10 22:41:24 +01:00
committed by GitHub
33 changed files with 72 additions and 100 deletions

View File

@@ -155,6 +155,7 @@ steps:
--exclude=".*" --exclude=".*"
--exclude="*_temp" --exclude="*_temp"
* $NGINX_USER@$NGINX_HOST:/etc/nginx/ * $NGINX_USER@$NGINX_HOST:/etc/nginx/
- ssh -i .ssh/id_ed25519 -o StrictHostKeyChecking 'sudo systemctl reload nginx'
environment: environment:
NGINX_USER: NGINX_USER:
from_secret: NGINX_USER from_secret: NGINX_USER
@@ -171,6 +172,6 @@ steps:
--- ---
kind: signature kind: signature
hmac: 7e392f769559ba043b923bbc35197ad955864d15a179979949528362731cbf29 hmac: af057f67070e2ea82be5b75874e0a5cc89ec8a912e71d2369f4d4537c02faecb
... ...

View File

@@ -35,7 +35,7 @@ http {
# Headers # # Headers #
################## ##################
more_set_headers 'X-Web-Entry Bifrost'; more_set_headers 'X-Web-Entry: Bifrost';
################## ##################
# SSL settings # # SSL settings #

View File

@@ -10,8 +10,8 @@ server {
server_name _; server_name _;
more_set_headers 'X-Dead-End true'; more_set_headers 'X-Dead-End: true';
more_set_headers 'Content-Type text/plain'; more_set_headers 'Content-Type: text/plain';
return 200 ok; return 200 ok;
} }
@@ -56,7 +56,7 @@ server {
# listen 80 default_server; # listen 80 default_server;
# listen [::]:80 default_server; # listen [::]:80 default_server;
# server_name planetposen.no *.leifsopplevelser.no ruterna.no *.kevinmidboe.com kevinmidboe.com knowit.vin seasoned.show request.movie *.schleppe.cloud *.k9e.no; # server_name planetposen.no *.leifsopplevelser.no ruterna.no *.kevinmidboe.com kevinmidboe.com knowit.vin seasoned.show request.movie *.schleppe.cloud *.k9e.no;
# add_header Upgrading Connection; # more_set_headers Upgrading Connection;
# return 302 https://$host$request_uri; # return 302 https://$host$request_uri;
#} #}

View File

@@ -5,7 +5,7 @@ server {
server_name adtech.schleppe.cloud; server_name adtech.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -5,7 +5,7 @@ server {
server_name blockchain.schleppe.cloud; server_name blockchain.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -23,4 +23,4 @@ server {
ssl_certificate /etc/letsencrypt/live/blockchain.schleppe.cloud/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/blockchain.schleppe.cloud/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/blockchain.schleppe.cloud/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/blockchain.schleppe.cloud/privkey.pem; # managed by Certbot
} }

View File

@@ -5,7 +5,7 @@ server {
server_name blog.kevinmidboe.com; server_name blog.kevinmidboe.com;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -26,4 +26,4 @@ server {
ssl_certificate /etc/letsencrypt/live/blog.kevinmidboe.com/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/blog.kevinmidboe.com/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/blog.kevinmidboe.com/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/blog.kevinmidboe.com/privkey.pem; # managed by Certbot
} }

View File

@@ -5,7 +5,7 @@ server {
server_name brew.schleppe.cloud beer.schleppe.cloud; server_name brew.schleppe.cloud beer.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -24,9 +24,9 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://brewpi.schleppe:8080; proxy_pass http://brewpi.schleppe:8080;
add_header 'Access-Control-Allow-Origin' 'brewpi.schleppe.cloud beer.schleppe.cloud'; more_set_headers 'Access-Control-Allow-Origin: brewpi.schleppe.cloud beer.schleppe.cloud';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
@@ -53,9 +53,9 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://brewpi.schleppe:8080; proxy_pass http://brewpi.schleppe:8080;
add_header 'Access-Control-Allow-Origin' 'brewpi.schleppe.cloud beer.schleppe.cloud'; more_set_headers 'Access-Control-Allow-Origin: brewpi.schleppe.cloud beer.schleppe.cloud';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;

View File

@@ -5,7 +5,7 @@ server {
server_name castdeck.schleppe.cloud; server_name castdeck.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -24,9 +24,9 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://castdeck.schleppe:80; proxy_pass http://castdeck.schleppe:80;
add_header 'Access-Control-Allow-Origin' '*'; more_set_headers 'Access-Control-Allow-Origin: *';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header Host $host; proxy_set_header Host $host;
} }

View File

@@ -5,7 +5,7 @@ server {
server_name drone.schleppe.cloud; server_name drone.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -15,7 +15,7 @@ server {
server_name kibana.schleppe.cloud elastic.schleppe.cloud es.schleppe.cloud elastic.keivnmidboe.com; server_name kibana.schleppe.cloud elastic.schleppe.cloud es.schleppe.cloud elastic.keivnmidboe.com;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -44,7 +44,7 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass https://elastic; proxy_pass https://elastic;
add_header X-Upstream $upstream_addr always; more_set_headers 'X-Upstream: $upstream_addr';
} }
ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud-0001/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud-0001/fullchain.pem; # managed by Certbot
@@ -62,7 +62,7 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://elastic; proxy_pass http://elastic;
add_header X-Upstream $upstream_addr always; more_set_headers 'X-Upstream: $upstream_addr';
} }
ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/elastic.schleppe.cloud/fullchain.pem; # managed by Certbot
@@ -80,7 +80,7 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://elastic; proxy_pass http://elastic;
add_header X-Upstream $upstream_addr always; more_set_headers 'X-Upstream $upstream_addr';
} }
ssl_certificate /etc/letsencrypt/live/elastic.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/elastic.kevinmidboe.com-0001/fullchain.pem; # managed by Certbot

View File

@@ -13,9 +13,9 @@ server {
location / { location / {
proxy_http_version 1.1; proxy_http_version 1.1;
add_header 'Access-Control-Allow-Origin' 'fjordmap.schleppe.cloud'; more_set_headers 'Access-Control-Allow-Origin: fjordmap.schleppe.cloud';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";

View File

@@ -5,7 +5,7 @@ server {
server_name git.schleppe.cloud; server_name git.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -14,7 +14,7 @@ server {
server_name grafana.schleppe.cloud; server_name grafana.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -26,6 +26,6 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto; proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; more_set_headers 'Strict-Transport-Security: max-age=15552000; includeSubDomains';
} }
} }

View File

@@ -11,9 +11,9 @@ server {
location / { location / {
proxy_http_version 1.1; proxy_http_version 1.1;
add_header 'Access-Control-Allow-Origin' 'hitler.kevinmidboe.com'; more_set_headers 'Access-Control-Allow-Origin: hitler.kevinmidboe.com';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";

View File

@@ -11,7 +11,7 @@ server {
server_name hive.schleppe.cloud; server_name hive.schleppe.cloud;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -1,28 +0,0 @@
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name k9ee.no;
error_page 404 /404.html;
location = /404.html {
root /home/kevin/;
}
location / {
resolver 10.0.0.72;
proxy_http_version 1.1;
add_header Proxy Bifrost;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_pass http://k9e.kazan.schleppe;
}
ssl_certificate /etc/letsencrypt/live/k9e.no/fullchain.pem; # managed by Kevin
ssl_certificate_key /etc/letsencrypt/live/k9e.no/privkey.pem; # managed by Kevin
}

View File

@@ -5,7 +5,7 @@ server {
server_name kevinmidboe.com; server_name kevinmidboe.com;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -8,7 +8,7 @@ server {
server_name *.leifsopplevelser.no leifsopplevelser.no; server_name *.leifsopplevelser.no leifsopplevelser.no;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -17,7 +17,7 @@ server {
server_name .lottis.vin .vinlottis.no aller.vin knowit.vin; server_name .lottis.vin .vinlottis.no aller.vin knowit.vin;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -137,7 +137,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host; proxy_set_header Host $host;
add_header 'Access-Control-Allow-Headers' 'Content-Type, vinlottis-admin'; more_set_headers 'Access-Control-Allow-Headers: Content-Type, vinlottis-admin';
} }
ssl_certificate /etc/letsencrypt/live/aller.lottis.vin/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/aller.lottis.vin/fullchain.pem; # managed by Certbot
@@ -161,7 +161,7 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host; proxy_set_header Host $host;
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
} }
ssl_certificate /etc/letsencrypt/live/aller.vin/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/aller.vin/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/aller.vin/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/aller.vin/privkey.pem; # managed by Certbot
@@ -195,4 +195,4 @@ server {
ssl_certificate_key /etc/letsencrypt/live/beta.lottis.vin/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/beta.lottis.vin/privkey.pem; # managed by Certbot
} }
# Beta end # Beta end
# - - - - - - - - # - - - - - - - -

View File

@@ -5,7 +5,7 @@ server {
server_name maps.schleppe.cloud; server_name maps.schleppe.cloud;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -5,7 +5,7 @@ server {
server_name memestream.schleppe.cloud; server_name memestream.schleppe.cloud;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -5,7 +5,7 @@ server {
server_name mondrian.schleppe.cloud; server_name mondrian.schleppe.cloud;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -24,7 +24,7 @@ server {
server_name planetposen.no planet.schleppe.cloud; server_name planetposen.no planet.schleppe.cloud;
more_set_headers Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -66,9 +66,9 @@ server {
proxy_request_buffering off; proxy_request_buffering off;
more_set_headers 'Access-Control-Allow-Origin planet.schleppe.cloud'; more_set_headers 'Access-Control-Allow-Origin: planet.schleppe.cloud';
more_set_headers 'Access-Control-Allow-Methods GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
more_set_headers 'Access-Control-Allow-Headers Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
client_max_body_size 5M; client_max_body_size 5M;
} }
@@ -77,19 +77,19 @@ server {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://planetposen-backend/api; proxy_pass http://planetposen-backend/api;
# add_header 'Access-Control-Allow-Origin' 'planet.schleppe.cloud'; # more_set_headers 'Access-Control-Allow-Origin' 'planet.schleppe.cloud';
more_set_headers 'Access-Control-Allow-Origin *'; more_set_headers 'Access-Control-Allow-Origin: *';
more_set_headers 'Access-Control-Allow-Methods GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
more_set_headers 'Access-Control-Allow-Headers Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
} }
location / { location / {
resolver 10.0.0.72; resolver 10.0.0.72;
proxy_pass http://planetposen-frontend; proxy_pass http://planetposen-frontend;
more_set_headers 'Access-Control-Allow-Origin planet.schleppe.cloud'; more_set_headers 'Access-Control-Allow-Origin: planet.schleppe.cloud';
more_set_headers 'Access-Control-Allow-Methods GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
more_set_headers 'Access-Control-Allow-Headers Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
} }
ssl_certificate /etc/letsencrypt/live/planet.schleppe.cloud/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/planet.schleppe.cloud/fullchain.pem; # managed by Certbot

View File

@@ -5,7 +5,7 @@ server {
server_name sonarr.schleppe.cloud tau.schleppe.cloud; server_name sonarr.schleppe.cloud tau.schleppe.cloud;
add_header Upgrading Connection; more_set_headers "Upgrading: Connection";
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -7,9 +7,9 @@ server {
location / { location / {
proxy_http_version 1.1; proxy_http_version 1.1;
add_header 'Access-Control-Allow-Origin' '*'; more_set_headers 'Access-Control-Allow-Origin: *';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";

View File

@@ -5,7 +5,7 @@ server {
server_name .request.movie; server_name .request.movie;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -7,9 +7,9 @@ server {
location / { location / {
proxy_http_version 1.1; proxy_http_version 1.1;
add_header 'Access-Control-Allow-Origin' 'lottis.vin'; more_set_headers 'Access-Control-Allow-Origin: lottis.vin';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";

View File

@@ -5,7 +5,7 @@ server {
server_name schleppe.cloud; server_name schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -5,7 +5,7 @@ server {
server_name wagovipps.schleppe.cloud; server_name wagovipps.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }
@@ -25,10 +25,10 @@ server {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-for $proxy_add_x_forwarded_for;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, OPTIONS'; more_set_headers 'Access-Control-Allow-Methods: GET, POST, PUT, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'Content-Type'; more_set_headers 'Access-Control-Allow-Headers: Content-Type';
} }
ssl_certificate /etc/letsencrypt/live/wagovipps.schleppe.cloud/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/wagovipps.schleppe.cloud/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/wagovipps.schleppe.cloud/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/wagovipps.schleppe.cloud/privkey.pem; # managed by Certbot
} }

View File

@@ -5,7 +5,7 @@ server {
server_name warden.schleppe.cloud; server_name warden.schleppe.cloud;
add_header Upgrading Connection; more_set_headers 'Upgrading: Connection';
return 302 https://$host$request_uri; return 302 https://$host$request_uri;
} }

View File

@@ -1 +0,0 @@
../sites-available/k9ee.conf

View File

@@ -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 X-Forwarded-for $proxy_add_x_forwarded_for;
proxy_set_header Host $host; proxy_set_header Host $host;
more_set_headers 'X-Proxy-Params Applied'; more_set_headers 'X-Proxy-Params: Applied';