From: Shane Jaroch <chown_tee@proton.me>
Date: Wed, 21 Jan 2026 21:52:24 +0000 (-0500)
Subject: separate dirs for dev and prod deploys
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=f720aa63ca10ac66d327ae4cb3ced193bfcc2254;p=nutratech%2Fvps-root.git

separate dirs for dev and prod deploys
---

diff --git a/Makefile b/Makefile
index 7a2ebdd..29a2f8c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,11 @@ 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
-	# Tar files and stream to remote - significantly faster than multiple SCPs
+	# Tar files and stream to remote
+	# Include only: "$(ENV)/*.conf" and non-env-specific "*.conf" files
 	tar cz \
 		etc/nginx/conf.d/*.conf \
+		etc/nginx/conf.d/$(ENV)/*.conf \
 		etc/gitweb.conf \
 		scripts/gitweb-simplefrontend \
 		scripts/deploy.sh \
diff --git a/etc/nginx/conf.d/default.dev.conf b/etc/nginx/conf.d/dev/default.conf
similarity index 100%
rename from etc/nginx/conf.d/default.dev.conf
rename to etc/nginx/conf.d/dev/default.conf
diff --git a/etc/nginx/conf.d/git-http.dev.conf b/etc/nginx/conf.d/dev/git-http.conf
similarity index 100%
rename from etc/nginx/conf.d/git-http.dev.conf
rename to etc/nginx/conf.d/dev/git-http.conf
diff --git a/etc/nginx/conf.d/moms-website.dev.conf b/etc/nginx/conf.d/dev/moms-website.conf
similarity index 100%
rename from etc/nginx/conf.d/moms-website.dev.conf
rename to etc/nginx/conf.d/dev/moms-website.conf
diff --git a/etc/nginx/conf.d/stalwart.dev.conf b/etc/nginx/conf.d/dev/stalwart.conf
similarity index 100%
rename from etc/nginx/conf.d/stalwart.dev.conf
rename to etc/nginx/conf.d/dev/stalwart.conf
diff --git a/etc/nginx/conf.d/default.prod.conf b/etc/nginx/conf.d/prod/default.conf
similarity index 100%
rename from etc/nginx/conf.d/default.prod.conf
rename to etc/nginx/conf.d/prod/default.conf
diff --git a/scripts/gitweb-simplefrontend/services.html b/scripts/gitweb-simplefrontend/services.html
index 86e2cbb..3fab7b2 100644
--- a/scripts/gitweb-simplefrontend/services.html
+++ b/scripts/gitweb-simplefrontend/services.html
@@ -36,7 +36,7 @@
         </div>
 
     <footer>
-        <p>Built: 2026-01-21 16:25:30  | Services: 3 | Server: San Jose, CA</p>
+        <p>Built: 2026-01-21 16:37:49  | Services: 3 | Server: San Jose, CA</p>
         <p>Nginx: <span class="ssi">v<!--#echo var="nginx_version"--></span> |
            Protocol: <span class="ssi"><!--#echo var="server_protocol"--></span> |
            Served: <span class="ssi"><!--#echo var="date_local"--></span> |
diff --git a/scripts/homepage.html b/scripts/homepage.html
index 7e711a8..27d1228 100644
--- a/scripts/homepage.html
+++ b/scripts/homepage.html
@@ -51,7 +51,7 @@
         </div>
 
     <footer>
-        <p>Built: 2026-01-21 16:25:30  | Services: 6 | Server: San Jose, CA</p>
+        <p>Built: 2026-01-21 16:37:49  | Services: 6 | Server: San Jose, CA</p>
         <p>Nginx: <span class="ssi">v<!--#echo var="nginx_version"--></span> |
            Protocol: <span class="ssi"><!--#echo var="server_protocol"--></span> |
            Served: <span class="ssi"><!--#echo var="date_local"--></span> |