diff --git a/src/network.sh b/src/network.sh index 73553c2..71e1770 100644 --- a/src/network.sh +++ b/src/network.sh @@ -326,7 +326,7 @@ closeBridge() { closeNetwork() { - if [[ "$DHCP" == [Yy1]* ]]; then + if [[ "${WEB:-}" != [Nn]* && "$DHCP" == [Yy1]* ]]; then # Shutdown nginx nginx -s stop 2> /dev/null @@ -504,9 +504,13 @@ else checkOS fi - # Shutdown nginx - nginx -s stop 2> /dev/null - fWait "nginx" + if [[ "${WEB:-}" != [Nn]* ]]; then + + # Shutdown nginx + nginx -s stop 2> /dev/null + fWait "nginx" + + fi if [[ "${NETWORK,,}" != "user"* ]]; then diff --git a/src/reset.sh b/src/reset.sh index 284f4d8..ccef801 100644 --- a/src/reset.sh +++ b/src/reset.sh @@ -189,20 +189,25 @@ addPackage() { return 0 } -# shellcheck disable=SC2143 -if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then +cp -r /var/www/* /run/shm +html "Starting $APP for Docker..." - sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf +if [[ "${WEB:-}" != [Nn]* ]]; then + + # shellcheck disable=SC2143 + if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then -else + sed -i "s/listen 5000 default_server;/listen [::]:5000 default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf - sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf + else + + sed -i "s/listen [::]:5000 default_server ipv6only=off;/listen 5000 default_server;/g" /etc/nginx/sites-enabled/web.conf + + fi + + # Start webserver + nginx -e stderr fi -# Start webserver -cp -r /var/www/* /run/shm -html "Starting $APP for Docker..." -nginx -e stderr - return 0