From c8a04f8707750a2a137c7b09f955435a61bff876 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 24 Oct 2016 14:41:26 -0700 Subject: [PATCH] remove code that stops nginx --- baseimage/initializeBaseUbuntuImage.sh | 1 - setup/start.sh | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index 69c7eb82e..2fbe9e8f4 100644 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -172,7 +172,6 @@ echo "==== Install nginx ====" apt-get -y install nginx-full [[ "$(nginx -v 2>&1)" == *"nginx/1.10."* ]] || die "Expecting nginx version to be 1.10.x" systemctl disable nginx -systemctl stop nginx echo "==== Install build-essential ====" apt-get -y install build-essential rcconf diff --git a/setup/start.sh b/setup/start.sh index 604f47289..cb2471d55 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -228,12 +228,7 @@ systemctl start cloudron.target sleep 2 # give systemd sometime to start the processes set_progress "85" "Reloading nginx" -if systemctl is-enabled nginx; then - nginx -s reload -else - systemctl enable nginx - systemctl start nginx -fi +nginx -s reload set_progress "100" "Done"