From c591494b30cf3845ea2231b6a98ad1154e69665c Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Tue, 19 Jun 2018 12:12:19 +0200
Subject: build: refresh services only in curl installer

---
 etc/ncp-config.d/nc-nextcloud.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'etc')

diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
index f4bb8d61..d8bb7750 100644
--- a/etc/ncp-config.d/nc-nextcloud.sh
+++ b/etc/ncp-config.d/nc-nextcloud.sh
@@ -68,16 +68,16 @@ install()
 
   usermod -a -G redis www-data
 
-  [[ "$DOCKERBUILD" != 1 ]] && {
+  # refresh configuration, only needed in curl installer
+  [[ ! -f /.ncp-image ]] && {
     systemctl restart redis-server
     systemctl enable  redis-server
 
-    # need to restart php
-    service php7.0-fpm stop
-    service mysql      stop
+    systemctl stop php7.0-fpm
+    systemctl stop mysql
     sleep 0.5
-    service php7.0-fpm start
-    service mysql      start
+    systemctl start php7.0-fpm
+    systemctl start mysql
   }
   
   # service to randomize passwords on first boot
@@ -94,7 +94,7 @@ ExecStart=/bin/bash /usr/local/bin/ncp-provisioning.sh
 [Install]
 WantedBy=multi-user.target
 EOF
-  systemctl enable nc-provisioning
+  [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nc-provisioning
   return 0
 }
 
-- 
cgit v1.2.3