From 6811cfc6eb4926c9b066990d08de38f333d031d9 Mon Sep 17 00:00:00 2001 From: Shane Date: Sun, 11 Jan 2026 01:00:39 +0000 Subject: [PATCH] idk bro --- Makefile | 6 +++--- scripts/deploy.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index acb16ca..0d25318 100644 --- 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 89a5f26..f68d09e 100755 --- 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." -- 2.52.0