From 305764ee384c650dac070abf18ce25d15c5864cb Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 13 Jun 2024 09:44:34 -0600 Subject: [PATCH] Removing duplicate 000-default.conf config file copy. --- repair.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repair.sh b/repair.sh index 76e7f7e1..a56e0f34 100755 --- a/repair.sh +++ b/repair.sh @@ -25,9 +25,10 @@ systemctl stop nginx || : systemctl stop renderd || : systemctl stop apache2 || : -# Reset any inadvertent changes to the WROLPi repo. +# Reset any inadvertent changes to the WROLPi repo. Restore ownership in case this repair script fails. git config --global --add safe.directory /opt/wrolpi git reset HEAD --hard +chown -R wrolpi:wrolpi /opt/wrolpi # Rebuild the app after reset. (cd app && npm run build) @@ -68,7 +69,6 @@ systemctl enable wrolpi-help.service cp /opt/wrolpi/etc/raspberrypios/renderd.conf /etc/renderd.conf # Configure Apache2 to listen on 8084. cp /opt/wrolpi/etc/raspberrypios/ports.conf /etc/apache2/ports.conf -cp /opt/wrolpi/etc/debian12/000-default.conf /etc/apache2/sites-available/000-default.conf # Copy Leaflet files to Apache's directory so they can be used offline. cp /opt/wrolpi/etc/raspberrypios/index.html \ /opt/wrolpi/modules/map/leaflet.js \