trim

diff --git a/Makefile b/Makefile
index 3b3e6ffae5a9dd92e6b98a3d6bbd68a96bf0fcfd..acb16ca6c6ea6c445ed67f5a7471a04e90d8fc28 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,9 @@ certbot/nginx: ##H @Remote Run certbot on remote VPS
        @echo "Running certbot on $(VPS_HOST)..."
        ssh -t $(VPS) "sudo certbot --nginx"
 
-.PHONY: stage/local
-stage/local: ##H @Local Stage files locally (supports SUDO_USER)
+# Internal caching/staging target (not intended for direct user use)
+.PHONY: _stage/local
+_stage/local:
 ifdef SUDO_USER
        @echo "Staging files locally for user $(SUDO_USER)..."
        rm -rf /tmp/nginx-staging && mkdir -p /tmp/nginx-staging
@@ -85,14 +86,23 @@ ifdef SUDO_USER
        cp scripts/deploy.sh /tmp/nginx-staging/
        chmod -R a+rX /tmp/nginx-staging
 else
-       @echo "Staging files locally..."
-       rm -rf ~/.nginx-staging && mkdir -p ~/.nginx-staging
-       cp -r etc/nginx/conf.d/*.conf ~/.nginx-staging/
-       cp scripts/deploy.sh ~/.nginx-staging/
+       @echo "Staging files locally (current user)..."
+       mkdir -p $(HOME)/.nginx-staging
+       rm -rf $(HOME)/.nginx-staging/*
+       cp -r etc/nginx/conf.d/*.conf $(HOME)/.nginx-staging/
+       # Only copy secrets.conf if it is decrypted (not binary)
+       @if grep -qI . etc/nginx/conf.d/secrets.conf; then \
+               echo "secrets.conf is decrypted, including it."; \
+       else \
+               echo "secrets.conf is ENCRYPTED, skipping."; \
+               rm -f $(HOME)/.nginx-staging/secrets.conf; \
+       fi
+       [ -f etc/gitweb.conf ] && cp etc/gitweb.conf $(HOME)/.nginx-staging/
+       cp scripts/deploy.sh $(HOME)/.nginx-staging/
 endif
 
 .PHONY: diff/local
-diff/local: stage/local ##H @Local Show diff locally (supports SUDO_USER)
+diff/local: _stage/local ##H @Local Show diff locally (supports SUDO_USER)
 ifdef SUDO_USER
        @echo "Checking diff locally as $(SUDO_USER)..."
        su -P $(SUDO_USER) -c "bash /tmp/nginx-staging/deploy.sh diff"

diff --git a/etc/gitweb.conf b/etc/gitweb.conf
index 9559e092e703dd6cf7ceb7477dbcbe84f8f901e3..b14c28e4a89e1593db5e77c5a5362c170788d75a 100644 (file)
--- a/etc/gitweb.conf
+++ b/etc/gitweb.conf
@@ -1,29 +1,29 @@
 # path to git projects (<project>.git)
-$projectroot = "/srv/git";
+$projectroot = "/srv/git"; # [CUSTOM: VPS git root]
 
 # directory to use for temp files
-$git_temp = "/tmp";
+$git_temp = "/tmp"; # [CUSTOM]
 
 # target of the home link on top of all pages
-$home_link = $my_uri || "/";
+$home_link = $my_uri || "/"; # [CUSTOM: Link to root]
 
 # html text to include at home page
-$home_text = "indextext.html";
+$home_text = "indextext.html"; # [CUSTOM]
 
 # file with project list; by default, simply scan the projectroot dir.
 #$projects_list = $projectroot;
 
 # stylesheet to use
-@stylesheets = ("/static/gitweb.css");
+@stylesheets = ("/static/gitweb.css"); # [CUSTOM]
 
 # javascript code for gitweb
-$javascript = "static/gitweb.js";
+$javascript = "static/gitweb.js"; # [CUSTOM]
 
 # logo to use
-$logo = "/static/git-logo.png";
+$logo = "/static/git-logo.png"; # [CUSTOM]
 
 # the 'favicon'
-$favicon = "/static/git-favicon.png";
+$favicon = "/static/git-favicon.png"; # [CUSTOM]
 
 # git-diff-tree(1) options to use for generated patches
 #@diff_opts = ("-M");