From 591b7b8aacab0400d057043761e1870205573de1 Mon Sep 17 00:00:00 2001 From: jaseg Date: Tue, 7 Dec 2021 16:53:18 +0100 Subject: Fix playbooks for clean re-deploy --- nginx.conf | 400 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 200 insertions(+), 200 deletions(-) (limited to 'nginx.conf') diff --git a/nginx.conf b/nginx.conf index cbae89b..5f70d96 100644 --- a/nginx.conf +++ b/nginx.conf @@ -38,51 +38,51 @@ http { server { listen 80; listen [::]:80; - server_name .jaseg.net; + server_name .jaseg.de; return 301 https://$host$request_uri; } - server { - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; - server_name gerbolyze.jaseg.net; - root /usr/share/nginx/html; - - ssl_certificate "/etc/letsencrypt/live/gerbolyze.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/gerbolyze.jaseg.net/privkey.pem"; - ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; - include /etc/letsencrypt/options-ssl-nginx.conf; - - ssl_stapling on; - ssl_stapling_verify on; - - resolver 67.207.67.2 67.207.67.3 valid=300s; - resolver_timeout 10s; - - add_header Strict-Transport-Security "max-age=86400"; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location ^~ /static/ { - root /var/lib/gerboweb; - } - - location / { - include uwsgi_params; - uwsgi_pass unix:/run/uwsgi/gerboweb.socket; - } - - error_page 404 /404.html; - location = /40x.html { - root /usr/share/nginx/html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } +# server { +# listen 443 ssl http2 default_server; +# listen [::]:443 ssl http2 default_server; +# server_name gerbolyze.jaseg.net; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/letsencrypt/live/gerbolyze.jaseg.net/fullchain.pem"; +# ssl_certificate_key "/etc/letsencrypt/live/gerbolyze.jaseg.net/privkey.pem"; +# ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# +# ssl_stapling on; +# ssl_stapling_verify on; +# +# resolver 67.207.67.2 67.207.67.3 valid=300s; +# resolver_timeout 10s; +# +# add_header Strict-Transport-Security "max-age=86400"; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location ^~ /static/ { +# root /var/lib/gerboweb; +# } +# +# location / { +# include uwsgi_params; +# uwsgi_pass unix:/run/uwsgi/gerboweb.socket; +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# root /usr/share/nginx/html; +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# root /usr/share/nginx/html; +# } +# } server { listen 443 ssl http2; @@ -188,170 +188,170 @@ http { } } - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name kochbuch.jaseg.net; - root /usr/share/nginx/html; - - ssl_certificate "/etc/letsencrypt/live/kochbuch.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/kochbuch.jaseg.net/privkey.pem"; - ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; - include /etc/letsencrypt/options-ssl-nginx.conf; - - ssl_stapling on; - ssl_stapling_verify on; - - resolver 67.207.67.2 67.207.67.3 valid=300s; - resolver_timeout 10s; - - add_header Strict-Transport-Security "max-age=86400"; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location / { - auth_basic "blubb"; - auth_basic_user_file /etc/nginx/kochbuch.htpasswd; - root /var/www/kochbuch.jaseg.net; - } - - error_page 404 /404.html; - location = /40x.html { - root /usr/share/nginx/html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } - - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name pogojig.jaseg.net; - root /usr/share/nginx/html; - - ssl_certificate "/etc/letsencrypt/live/pogojig.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/pogojig.jaseg.net/privkey.pem"; - ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; - include /etc/letsencrypt/options-ssl-nginx.conf; - - ssl_stapling on; - ssl_stapling_verify on; - - resolver 67.207.67.2 67.207.67.3 valid=300s; - resolver_timeout 10s; - client_max_body_size 10M; - - add_header Strict-Transport-Security "max-age=86400"; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location ^~ /pogospace/ { - root /var/lib/pogojig/pogospace; - } - - location / { - include uwsgi_params; - uwsgi_pass unix:/run/uwsgi/pogojig.socket; - } - - error_page 404 /404.html; - location = /40x.html { - root /usr/share/nginx/html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } - - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name tracespace.jaseg.net; - root /usr/share/nginx/html; - - ssl_certificate "/etc/letsencrypt/live/tracespace.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/tracespace.jaseg.net/privkey.pem"; - ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; - include /etc/letsencrypt/options-ssl-nginx.conf; - - ssl_stapling on; - ssl_stapling_verify on; - - resolver 67.207.67.2 67.207.67.3 valid=300s; - resolver_timeout 10s; - - add_header Strict-Transport-Security "max-age=86400"; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location / { - root /var/www/tracespace.jaseg.net; - } - - error_page 404 /404.html; - location = /40x.html { - root /usr/share/nginx/html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } - - server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name openjscad.jaseg.net; - root /usr/share/nginx/html; - - ssl_certificate "/etc/letsencrypt/live/openjscad.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/openjscad.jaseg.net/privkey.pem"; - ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; - include /etc/letsencrypt/options-ssl-nginx.conf; - - ssl_stapling on; - ssl_stapling_verify on; - - resolver 67.207.67.2 67.207.67.3 valid=300s; - resolver_timeout 10s; - - add_header Strict-Transport-Security "max-age=86400"; - - # Load configuration files for the default server block. - include /etc/nginx/default.d/*.conf; - - location / { - root /var/www/openjscad.jaseg.net; - } - - error_page 404 /404.html; - location = /40x.html { - root /usr/share/nginx/html; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } +# server { +# listen 443 ssl http2; +# listen [::]:443 ssl http2; +# server_name kochbuch.jaseg.de; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/letsencrypt/live/kochbuch.jaseg.de/fullchain.pem"; +# ssl_certificate_key "/etc/letsencrypt/live/kochbuch.jaseg.de/privkey.pem"; +# ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# +# ssl_stapling on; +# ssl_stapling_verify on; +# +# resolver 67.207.67.2 67.207.67.3 valid=300s; +# resolver_timeout 10s; +# +# add_header Strict-Transport-Security "max-age=86400"; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location / { +# auth_basic "blubb"; +# auth_basic_user_file /etc/nginx/kochbuch.htpasswd; +# root /var/www/kochbuch.jaseg.de; +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# root /usr/share/nginx/html; +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# root /usr/share/nginx/html; +# } +# } + +# server { +# listen 443 ssl http2; +# listen [::]:443 ssl http2; +# server_name pogojig.jaseg.net; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/letsencrypt/live/pogojig.jaseg.net/fullchain.pem"; +# ssl_certificate_key "/etc/letsencrypt/live/pogojig.jaseg.net/privkey.pem"; +# ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# +# ssl_stapling on; +# ssl_stapling_verify on; +# +# resolver 67.207.67.2 67.207.67.3 valid=300s; +# resolver_timeout 10s; +# client_max_body_size 10M; +# +# add_header Strict-Transport-Security "max-age=86400"; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location ^~ /pogospace/ { +# root /var/lib/pogojig/pogospace; +# } +# +# location / { +# include uwsgi_params; +# uwsgi_pass unix:/run/uwsgi/pogojig.socket; +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# root /usr/share/nginx/html; +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# root /usr/share/nginx/html; +# } +# } + +# server { +# listen 443 ssl http2; +# listen [::]:443 ssl http2; +# server_name tracespace.jaseg.net; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/letsencrypt/live/tracespace.jaseg.net/fullchain.pem"; +# ssl_certificate_key "/etc/letsencrypt/live/tracespace.jaseg.net/privkey.pem"; +# ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# +# ssl_stapling on; +# ssl_stapling_verify on; +# +# resolver 67.207.67.2 67.207.67.3 valid=300s; +# resolver_timeout 10s; +# +# add_header Strict-Transport-Security "max-age=86400"; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location / { +# root /var/www/tracespace.jaseg.net; +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# root /usr/share/nginx/html; +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# root /usr/share/nginx/html; +# } +# } +# +# server { +# listen 443 ssl http2; +# listen [::]:443 ssl http2; +# server_name openjscad.jaseg.net; +# root /usr/share/nginx/html; +# +# ssl_certificate "/etc/letsencrypt/live/openjscad.jaseg.net/fullchain.pem"; +# ssl_certificate_key "/etc/letsencrypt/live/openjscad.jaseg.net/privkey.pem"; +# ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# +# ssl_stapling on; +# ssl_stapling_verify on; +# +# resolver 67.207.67.2 67.207.67.3 valid=300s; +# resolver_timeout 10s; +# +# add_header Strict-Transport-Security "max-age=86400"; +# +# # Load configuration files for the default server block. +# include /etc/nginx/default.d/*.conf; +# +# location / { +# root /var/www/openjscad.jaseg.net; +# } +# +# error_page 404 /404.html; +# location = /40x.html { +# root /usr/share/nginx/html; +# } +# +# error_page 500 502 503 504 /50x.html; +# location = /50x.html { +# root /usr/share/nginx/html; +# } +# } server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name vcdrender.jaseg.net; + server_name vcdrender.jaseg.de; root /usr/share/nginx/html; - ssl_certificate "/etc/letsencrypt/live/vcdrender.jaseg.net/fullchain.pem"; - ssl_certificate_key "/etc/letsencrypt/live/vcdrender.jaseg.net/privkey.pem"; + ssl_certificate "/etc/letsencrypt/live/vcdrender.jaseg.de/fullchain.pem"; + ssl_certificate_key "/etc/letsencrypt/live/vcdrender.jaseg.de/privkey.pem"; ssl_dhparam "/etc/letsencrypt/ssl-dhparams.pem"; include /etc/letsencrypt/options-ssl-nginx.conf; -- cgit