diff --git a/al.ert.space b/al.ert.space index 15843db..b09d758 100644 --- a/al.ert.space +++ b/al.ert.space @@ -1,5 +1,4 @@ server { - server_name al.ert.space; root /srv/www/al.ert.space/app; index index.html /server/index.php; diff --git a/doi.ionathan.ch b/doi.ionathan.ch index 8989ca0..40ec176 100644 --- a/doi.ionathan.ch +++ b/doi.ionathan.ch @@ -6,14 +6,11 @@ server { try_files $uri $uri/ =404; } - listen 443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/git.ionathan.ch/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/git.ionathan.ch/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - } server { @@ -21,10 +18,7 @@ server { return 301 https://$host$request_uri; } # managed by Certbot - server_name doi.ionathan.ch; listen 80; return 404; # managed by Certbot - - } diff --git a/ert.space b/ert.space index eeb6e42..e06b65b 100644 --- a/ert.space +++ b/ert.space @@ -12,7 +12,6 @@ server { ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - } server { diff --git a/ex.ert.space b/ex.ert.space index 2f34af0..6f48c2d 100644 --- a/ex.ert.space +++ b/ex.ert.space @@ -21,7 +21,6 @@ server { ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - } server { diff --git a/git.ionathan.ch b/git.ionathan.ch index a946110..6755160 100644 --- a/git.ionathan.ch +++ b/git.ionathan.ch @@ -6,14 +6,11 @@ server { proxy_set_header X-Real-IP $remote_addr; } - listen 443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/git.ionathan.ch/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/git.ionathan.ch/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - } server { @@ -21,10 +18,7 @@ server { return 301 https://$host$request_uri; } # managed by Certbot - server_name git.ionathan.ch; listen 80; return 404; # managed by Certbot - - } diff --git a/next.ionathan.ch b/next.ionathan.ch index ff00324..215c9c4 100644 --- a/next.ionathan.ch +++ b/next.ionathan.ch @@ -1,5 +1,4 @@ server { - server_name next.ionathan.ch; client_max_body_size 512M; add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; @@ -16,14 +15,11 @@ server { return 301 $scheme://$host/remote.php/dav; } - listen 443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/git.ionathan.ch/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/git.ionathan.ch/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - } server { @@ -31,11 +27,7 @@ server { return 301 https://$host$request_uri; } # managed by Certbot - - server_name next.ionathan.ch; listen 80; return 404; # managed by Certbot - - } diff --git a/nitter.ionathan.ch b/nitter.ionathan.ch new file mode 100644 index 0000000..86f6334 --- /dev/null +++ b/nitter.ionathan.ch @@ -0,0 +1,25 @@ +server { + server_name nitter.ionathan.ch; + location / { + proxy_pass http://localhost:8888; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + } + + listen [::]:443 ssl ipv6only=on; # managed by Certbot + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/git.ionathan.ch/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/git.ionathan.ch/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot +} +server { + if ($host = nitter.ionathan.ch) { + return 301 https://$host$request_uri; + } # managed by Certbot + + listen 80; + listen [::]:80; + server_name nitter.ionathan.ch; + return 404; # managed by Certbot +} diff --git a/rss.ionathan.ch b/rss.ionathan.ch index 1b247e1..04b0ce2 100644 --- a/rss.ionathan.ch +++ b/rss.ionathan.ch @@ -7,14 +7,11 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - listen 443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/git.ionathan.ch/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/git.ionathan.ch/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - - } server { @@ -22,10 +19,7 @@ server { return 301 https://$host$request_uri; } # managed by Certbot - server_name rss.ionathan.ch; listen 80; return 404; # managed by Certbot - - }