idk bro

diff --git a/Makefile b/Makefile
index acb16ca6c6ea6c445ed67f5a7471a04e90d8fc28..0d25318a43a66301bc599eff5e5419db5458d4b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ ifdef SUDO_USER
                echo "secrets.conf is ENCRYPTED, skipping."; \
                rm -f /tmp/nginx-staging/secrets.conf; \
        fi
-       # Copy gitweb.conf if it exists
-       [ -f etc/gitweb.conf ] && cp etc/gitweb.conf /tmp/nginx-staging/
+       # Copy gitweb.conf if it exists (rename to .perl to avoid Nginx *.conf include)
+       [ -f etc/gitweb.conf ] && cp etc/gitweb.conf /tmp/nginx-staging/gitweb.conf.perl
        cp scripts/deploy.sh /tmp/nginx-staging/
        chmod -R a+rX /tmp/nginx-staging
 else
@@ -97,7 +97,7 @@ 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/
+       [ -f etc/gitweb.conf ] && cp etc/gitweb.conf $(HOME)/.nginx-staging/gitweb.conf.perl
        cp scripts/deploy.sh $(HOME)/.nginx-staging/
 endif
 

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 89a5f261f168d11b4b2048f10f7f6996ecd2a10f..f68d09e578216e1b0144438ea42160c477704f3b 100755 (executable)
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -65,11 +65,11 @@ if sudo nginx -t; then
     sudo nginx -s reload
 
     # Deploy gitweb.conf if it exists in staging
-    if [ -f "$STAGING_DIR/gitweb.conf" ]; then
+    if [ -f "$STAGING_DIR/gitweb.conf.perl" ]; then
         echo "Deploying gitweb.conf..."
         # Backup existing
         [ -f /etc/gitweb.conf ] && sudo cp /etc/gitweb.conf $BACKUP_DIR/gitweb.conf
-        sudo cp "$STAGING_DIR/gitweb.conf" /etc/gitweb.conf
+        sudo cp "$STAGING_DIR/gitweb.conf.perl" /etc/gitweb.conf
     fi
 
     echo "✓ Deployment successful."