From f720aa63ca10ac66d327ae4cb3ced193bfcc2254 Mon Sep 17 00:00:00 2001 From: Shane Jaroch Date: Wed, 21 Jan 2026 16:52:24 -0500 Subject: [PATCH] separate dirs for dev and prod deploys --- Makefile | 4 +++- etc/nginx/conf.d/{default.dev.conf => dev/default.conf} | 0 etc/nginx/conf.d/{git-http.dev.conf => dev/git-http.conf} | 0 .../conf.d/{moms-website.dev.conf => dev/moms-website.conf} | 0 etc/nginx/conf.d/{stalwart.dev.conf => dev/stalwart.conf} | 0 etc/nginx/conf.d/{default.prod.conf => prod/default.conf} | 0 scripts/gitweb-simplefrontend/services.html | 2 +- scripts/homepage.html | 2 +- 8 files changed, 5 insertions(+), 3 deletions(-) rename etc/nginx/conf.d/{default.dev.conf => dev/default.conf} (100%) rename etc/nginx/conf.d/{git-http.dev.conf => dev/git-http.conf} (100%) rename etc/nginx/conf.d/{moms-website.dev.conf => dev/moms-website.conf} (100%) rename etc/nginx/conf.d/{stalwart.dev.conf => dev/stalwart.conf} (100%) rename etc/nginx/conf.d/{default.prod.conf => prod/default.conf} (100%) 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 @@