From 8ec95a3b1b30f156a79d7709bdfc5e6c528f1c9d Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Thu, 27 Apr 2023 15:47:27 -0700 Subject: [PATCH] consolidate ssl-params and proxy_params Signed-off-by: Arthur Lu --- nginx.conf | 10 ++++++++ .../proxy-params.conf => proxy-params.conf | 0 sites/client.conf | 8 +++--- sites/default.conf | 2 +- sites/homepage.conf | 5 ++-- sites/ldap.conf | 5 ++-- sites/mail.conf | 5 ++-- sites/nextcloud.conf | 5 ++-- sites/opns.conf | 5 ++-- sites/pve.conf | 5 ++-- sites/root.conf | 5 ++-- sites/status.conf | 5 ++-- sites/wiki.conf | 5 ++-- snippets/ssl-acme.conf | 5 ++++ snippets/ssl-params.conf | 25 ------------------- ssl-params.conf | 19 ++++++++++++++ 16 files changed, 56 insertions(+), 58 deletions(-) rename snippets/proxy-params.conf => proxy-params.conf (100%) create mode 100644 snippets/ssl-acme.conf delete mode 100644 snippets/ssl-params.conf create mode 100644 ssl-params.conf diff --git a/nginx.conf b/nginx.conf index a96a09c..a94dcb5 100644 --- a/nginx.conf +++ b/nginx.conf @@ -9,12 +9,15 @@ http { tcp_nopush on; types_hash_max_size 2048; + # mime types include /etc/nginx/mime.types; default_type application/octet-stream; + # logging access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; + # gzip gzip on; gzip_vary on; gzip_proxied any; @@ -23,5 +26,12 @@ http { gzip_http_version 1.1; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + # ssl parameters + include /etc/nginx/ssl-params.conf + + # proxy parameters + include /etc/nginx/proxy-params.conf + + # include sites include /etc/nginx/sites/*; } diff --git a/snippets/proxy-params.conf b/proxy-params.conf similarity index 100% rename from snippets/proxy-params.conf rename to proxy-params.conf diff --git a/sites/client.conf b/sites/client.conf index 39a83ef..98d11c7 100644 --- a/sites/client.conf +++ b/sites/client.conf @@ -1,14 +1,12 @@ server { listen 443 ssl http2; server_name client.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; location / { include /etc/nginx/snippets/error-pages.conf; - proxy_pass http://proxmoxaas.dmz:8080; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://proxmoxaas.dmz:8080; } location /api/ { - proxy_pass http://proxmoxaas.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://proxmoxaas.dmz:80; } } diff --git a/sites/default.conf b/sites/default.conf index 1c5d74b..a7ee54c 100644 --- a/sites/default.conf +++ b/sites/default.conf @@ -1,6 +1,6 @@ server { listen 443 ssl http2 default_server; server_name *.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; return 301 https://tronnet.net; } diff --git a/sites/homepage.conf b/sites/homepage.conf index 75ea570..b2dc9ef 100644 --- a/sites/homepage.conf +++ b/sites/homepage.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://sites.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://sites.dmz:80; } } diff --git a/sites/ldap.conf b/sites/ldap.conf index d88fcf0..70de1e2 100644 --- a/sites/ldap.conf +++ b/sites/ldap.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name ldap.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://ldap.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://ldap.dmz:80; } } diff --git a/sites/mail.conf b/sites/mail.conf index d5933b8..334463c 100644 --- a/sites/mail.conf +++ b/sites/mail.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name mail.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass https://mail2.dmz; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass https://mail2.dmz; } } diff --git a/sites/nextcloud.conf b/sites/nextcloud.conf index 659c428..f875e1b 100644 --- a/sites/nextcloud.conf +++ b/sites/nextcloud.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name nextcloud.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://nextcloud2.dmz:11000; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://nextcloud2.dmz:11000; } } diff --git a/sites/opns.conf b/sites/opns.conf index fad7c36..1a95ce6 100644 --- a/sites/opns.conf +++ b/sites/opns.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name opns.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass https://10.0.0.1:10443; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass https://10.0.0.1:10443; } } diff --git a/sites/pve.conf b/sites/pve.conf index b85b69d..ba67a55 100644 --- a/sites/pve.conf +++ b/sites/pve.conf @@ -1,9 +1,8 @@ server { listen 443 ssl http2; server_name pve.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; location / { - proxy_pass https://geigatron-0-pve.tn:8006; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass https://geigatron-0-pve.tn:8006; } } diff --git a/sites/root.conf b/sites/root.conf index affd625..06651cd 100644 --- a/sites/root.conf +++ b/sites/root.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name root.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://root.root:80; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://root.root:80; } } diff --git a/sites/status.conf b/sites/status.conf index 84b93e8..70ee567 100644 --- a/sites/status.conf +++ b/sites/status.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name status.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://sites.dmz:8080; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://sites.dmz:8080; } } diff --git a/sites/wiki.conf b/sites/wiki.conf index 4e6cd2e..c4834df 100644 --- a/sites/wiki.conf +++ b/sites/wiki.conf @@ -1,10 +1,9 @@ server { listen 443 ssl http2; server_name wiki.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + include /etc/nginx/snippets/ssl-acme.conf; include /etc/nginx/snippets/error-pages.conf; location / { - proxy_pass http://sites.dmz:8081; - include /etc/nginx/snippets/proxy-params.conf; + proxy_pass http://sites.dmz:8081; } } diff --git a/snippets/ssl-acme.conf b/snippets/ssl-acme.conf new file mode 100644 index 0000000..52b3867 --- /dev/null +++ b/snippets/ssl-acme.conf @@ -0,0 +1,5 @@ +# letsencrypt validation +location '/.well-known/acme-challenge' { + default_type "text/plain"; + root /var/www/html; +} \ No newline at end of file diff --git a/snippets/ssl-params.conf b/snippets/ssl-params.conf deleted file mode 100644 index 0078276..0000000 --- a/snippets/ssl-params.conf +++ /dev/null @@ -1,25 +0,0 @@ -ssl_protocols SSLv3 TLSv1.1 TLSv1.2 TLSv1.3; -ssl_ciphers 'TLS13-AES-256-GCM-SHA384:TLS-CHACHA20-POLY1305-SHA256:TLS-AES-256-GCM-SHA384:TLS-AES-128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256 EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH+aRSA+RC4:EECDH:EDH+aRSA:RC4:!aNULL:!eNULL:!LOW:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!CAMELLIA'; -ssl_prefer_server_ciphers on; -ssl_ecdh_curve secp384r1; -ssl_session_cache shared:SSL:50m; -ssl_session_timeout 1d; -ssl_session_tickets off; -ssl_stapling on; -ssl_stapling_verify on; -resolver 8.8.8.8 8.8.4.4 valid=300s; -resolver_timeout 5s; -add_header X-Frame-Options SAMEORIGIN; -add_header X-Content-Type-Options nosniff; -add_header X-XSS-Protection "1; mode=block"; -ssl_dhparam /etc/ssl/certs/dhparam.pem; - -# ssl cert paths -ssl_certificate /etc/letsencrypt/live/tronnet.net/fullchain.pem; -ssl_certificate_key /etc/letsencrypt/live/tronnet.net/privkey.pem; - -# letsencrypt validation -location '/.well-known/acme-challenge' { - default_type "text/plain"; - root /var/www/html; -} diff --git a/ssl-params.conf b/ssl-params.conf new file mode 100644 index 0000000..4463aab --- /dev/null +++ b/ssl-params.conf @@ -0,0 +1,19 @@ +ssl_protocols TLSv1.2 TLSv1.3; +ssl_ciphers HIGH:!aNULL:!MD5; +ssl_prefer_server_ciphers on; +ssl_ecdh_curve auto; +ssl_session_cache shared:SSL:50m; +ssl_session_timeout 1d; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; +resolver 8.8.8.8 8.8.4.4 valid=300s; +resolver_timeout 5s; +add_header X-Frame-Options SAMEORIGIN; +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +ssl_dhparam /etc/ssl/certs/dhparam.pem; + +# ssl cert paths +ssl_certificate /etc/letsencrypt/live/tronnet.net/fullchain.pem; +ssl_certificate_key /etc/letsencrypt/live/tronnet.net/privkey.pem;