separate dirs for dev and prod deploys

diff --git a/Makefile b/Makefile
index 7a2ebdd33f2044c89305c847b2313872010284e4..29a2f8c5e5bdaaa2a7095980975aa97acd5a11c6 100644 (file)
--- 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 86e2cbb6a6e237e359b7c282f358948acd61cddc..3fab7b21f4971f89b10f7dfca628656d6a9ab535 100644 (file)
--- 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 7e711a89ce203f92429fd3003e5e5bb40747b17f..27d122879f76c4d995bae18dd8cf2eef111c2a24 100644 (file)
--- 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> |