update domains/nginx stuff

diff --git a/Makefile b/Makefile
index 43685ef82926f3b54b1b7e59853aa734b60d99a7..5403e34e1c4996cb126ba209b3576f01a1b1228a 100644 (file)
--- 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 (file)
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 e18522f6f85dd94dd882686cf0059c4e22c9e16f..c8b0419c4b26ead246f5011bcbf07baf90408645 100644 (file)
--- 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;