From 8fab32ef75bf4b55ea1712ed775e75be052afaf8 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 26 Feb 2026 17:38:36 -0700 Subject: [PATCH] Copying WROLPi nginx config on first startup so Controller is accessible. --- .../config/hooks/normal/9999-wrolpi.hook.chroot | 2 ++ pi-gen/stage2/04-wrolpi/03-run-chroot.sh | 2 ++ wrolpi/scripts/first_startup.sh | 8 ++++++++ 3 files changed, 12 insertions(+) diff --git a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot index d3e6a0d0..505bc87b 100644 --- a/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot +++ b/debian-live-config/config/hooks/normal/9999-wrolpi.hook.chroot @@ -63,6 +63,8 @@ cp /opt/wrolpi/etc/raspberrypios/50x.html /var/www/50x.html # Copy wrolpi.conf which defines the location blocks for reverse proxy. [ -f /etc/nginx/conf.d/default.conf ] && rm /etc/nginx/conf.d/default.conf cp /opt/wrolpi/etc/raspberrypios/wrolpi.conf /etc/nginx/conf.d/wrolpi.conf +# Remove default site (WROLPi nginx.conf doesn't use sites-enabled). +rm -f /etc/nginx/sites-enabled/default # WROLPi needs a few privileged commands. cp /opt/wrolpi/etc/raspberrypios/90-wrolpi /etc/sudoers.d/90-wrolpi diff --git a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh index 6ddb615b..6dbbb3f7 100755 --- a/pi-gen/stage2/04-wrolpi/03-run-chroot.sh +++ b/pi-gen/stage2/04-wrolpi/03-run-chroot.sh @@ -65,6 +65,8 @@ cp /opt/wrolpi/etc/raspberrypios/50x.html /var/www/50x.html # Copy wrolpi.conf which defines the location blocks for reverse proxy. [ -f /etc/nginx/conf.d/default.conf ] && rm /etc/nginx/conf.d/default.conf cp /opt/wrolpi/etc/raspberrypios/wrolpi.conf /etc/nginx/conf.d/wrolpi.conf +# Remove default site (WROLPi nginx.conf doesn't use sites-enabled). +rm -f /etc/nginx/sites-enabled/default # WROLPi needs a few privileged commands. cp /opt/wrolpi/etc/raspberrypios/90-wrolpi /etc/sudoers.d/90-wrolpi diff --git a/wrolpi/scripts/first_startup.sh b/wrolpi/scripts/first_startup.sh index f432a488..52bcc27c 100755 --- a/wrolpi/scripts/first_startup.sh +++ b/wrolpi/scripts/first_startup.sh @@ -6,6 +6,14 @@ set -x # Generate nginx certificate for HTTPS if it doesn't exist. /opt/wrolpi/scripts/generate_certificates.sh +# Ensure nginx config files are in place (safeguard in case build didn't complete this). +if [ ! -f /etc/nginx/conf.d/wrolpi.conf ]; then + echo "wrolpi.conf missing, copying from /opt/wrolpi..." + cp /opt/wrolpi/etc/raspberrypios/wrolpi.conf /etc/nginx/conf.d/wrolpi.conf +fi +# Remove default site if it exists (WROLPi nginx.conf doesn't use sites-enabled). +rm -f /etc/nginx/sites-enabled/default + # Enable and start nginx now that certificates exist. systemctl enable nginx systemctl start nginx || echo "Warning: nginx failed to start"