From: Shane Jaroch Date: Wed, 21 Jan 2026 04:44:16 +0000 (-0500) Subject: update domains/nginx stuff X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=665ab14edde3142bcd110405be48413e4f04b550;p=nutratech%2Fvps-root.git update domains/nginx stuff --- diff --git a/Makefile b/Makefile index 43685ef..5403e34 100644 --- a/Makefile +++ b/Makefile @@ -59,13 +59,15 @@ VPS := $(VPS_USER)@$(VPS_HOST) stage/nginx: ##H @Remote Stage files on the remote VPS @echo "Staging files on $(VPS_HOST) (ENV=$(ENV))..." python3 scripts/gen_services_map.py etc/nginx/conf.d/default.$(ENV).conf - ssh $(VPS) 'rm -rf ~/.nginx-staging && mkdir -p ~/.nginx-staging/etc/nginx/conf.d ~/.nginx-staging/scripts/gitweb-simplefrontend' - scp -q -r etc/nginx/conf.d/*.conf $(VPS):~/.nginx-staging/etc/nginx/conf.d/ - scp -q etc/gitweb.conf $(VPS):~/.nginx-staging/etc/gitweb.conf - scp -q -r scripts/gitweb-simplefrontend/* $(VPS):~/.nginx-staging/scripts/gitweb-simplefrontend/ - scp -q scripts/deploy.sh $(VPS):~/.nginx-staging/scripts/deploy.sh - scp -q scripts/gen_services_map.py $(VPS):~/.nginx-staging/scripts/gen_services_map.py - scp -q scripts/homepage.html $(VPS):~/.nginx-staging/scripts/homepage.html + # Tar files and stream to remote - significantly faster than multiple SCPs + tar cz \ + etc/nginx/conf.d/*.conf \ + etc/gitweb.conf \ + scripts/gitweb-simplefrontend \ + scripts/deploy.sh \ + scripts/gen_services_map.py \ + scripts/homepage.html | \ + ssh $(VPS) "rm -rf ~/.nginx-staging && mkdir -p ~/.nginx-staging && tar xz -C ~/.nginx-staging" .PHONY: diff/nginx diff/nginx: ##H @Remote Show diff between local and remote diff --git a/etc/nginx/conf.d/moms-website.conf.disabled b/etc/nginx/conf.d/moms-website.conf.disabled new file mode 100644 index 0000000..360fec4 --- /dev/null +++ b/etc/nginx/conf.d/moms-website.conf.disabled @@ -0,0 +1,2 @@ +# This file exists to trigger the deletion of moms-website.conf +# via the deployment script's cleanup logic. diff --git a/etc/nginx/conf.d/moms-website.conf b/etc/nginx/conf.d/moms-website.dev.conf similarity index 97% rename from etc/nginx/conf.d/moms-website.conf rename to etc/nginx/conf.d/moms-website.dev.conf index e18522f..c8b0419 100644 --- a/etc/nginx/conf.d/moms-website.conf +++ b/etc/nginx/conf.d/moms-website.dev.conf @@ -9,8 +9,8 @@ server { server { # HTTP/3 (QUIC) - UDP - listen 443 quic reuseport; - listen [::]:443 quic reuseport; + listen 443 quic; + listen [::]:443 quic; # HTTP/2 & 1.1 (Fallback) - TCP listen 443 ssl;