From 1a983ebcd14c129a3c72d18f344c125f04b7e95b Mon Sep 17 00:00:00 2001 From: Kroese Date: Thu, 23 Jul 2026 04:17:26 +0200 Subject: [PATCH] feat: Improve error handling for webserver config (#1320) --- src/server.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/server.sh b/src/server.sh index 508156e..3a5bcb9 100644 --- a/src/server.sh +++ b/src/server.sh @@ -22,17 +22,28 @@ prepareWebFiles() { configureWebPorts() { - sed -i "s/listen 5000 default_server;/listen $WEB_PORT default_server;/g" /etc/nginx/sites-enabled/web.conf - sed -i "s/proxy_pass http:\/\/127.0.0.1:8004\/;/proxy_pass http:\/\/127.0.0.1:$WSD_PORT\/;/g" /etc/nginx/sites-enabled/web.conf + if ! sed -i \ + -e "s|listen 5000 default_server;|listen $WEB_PORT default_server;|g" \ + -e "s|proxy_pass http://127.0.0.1:8004/;|proxy_pass http://127.0.0.1:$WSD_PORT/;|g" \ + /etc/nginx/sites-enabled/web.conf; then + error "Failed to configure webserver ports!" + return 1 + fi return 0 } configureIpv6Listen() { - # shellcheck disable=SC2143 if [ -f /proc/net/if_inet6 ] && [[ "$(cat /proc/sys/net/ipv6/conf/all/disable_ipv6 2>/dev/null)" != "1" ]]; then - sed -i "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf + + if ! sed -i \ + "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" \ + /etc/nginx/sites-enabled/web.conf; then + error "Failed to configure IPv6 webserver listener!" + return 1 + fi + fi return 0