nc-limits: fix PHP service restart

nextcloud · Oct 6, 2018 · 5e3d411 · 5e3d411
1 parent 0bf6045
commit 5e3d411
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 25 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,11 @@
 
-[v0.62.5](https://github.com/nextcloud/nextcloudpi/commit/ca01dbf) (2018-10-03) nc-update-nc: dont fix the news app if there is no news app
+[v0.62.6](https://github.com/nextcloud/nextcloudpi/commit/d069004) (2018-10-06) nc-limits: fix PHP service restart
 
-[v0.62.4](https://github.com/nextcloud/nextcloudpi/commit/b449e54) (2018-10-03) nc-update-nextcloud: option to upgrade to the latest version
+[v0.62.5](https://github.com/nextcloud/nextcloudpi/commit/0bf6045) (2018-10-03) nc-update-nc: dont fix the news app if there is no news app
 
-[v0.62.3, master](https://github.com/nextcloud/nextcloudpi/commit/af4b646) (2018-10-03) nc-autoupdate-nc: fix repeating notification
+[v0.62.4 ](https://github.com/nextcloud/nextcloudpi/commit/aa886f9) (2018-10-03) nc-update-nextcloud: option to upgrade to the latest version
+
+[v0.62.3 ](https://github.com/nextcloud/nextcloudpi/commit/af4b646) (2018-10-03) nc-autoupdate-nc: fix repeating notification
 
 [v0.62.2 ](https://github.com/nextcloud/nextcloudpi/commit/6324949) (2018-10-02) nc-prettyURL: make sure URL is correct
 

diff --git a/etc/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh
@@ -47,15 +47,8 @@ configure()
   # RESTART PHP
   [[ "$PHPTHREADS_"  != "$CURRENT_THREADS"   ]] || \
   [[ "$MEMORYLIMIT"  != "$CURRENT_PHP_MEM"   ]] || \
-  [[ "$MAXFILESIZE_" != "$CURRENT_FILE_SIZE" ]] && {
-    bash -c " sleep 3
-              service php${PHPVER}-fpm stop
-              service mysql      stop
-              sleep 0.5
-              service php${PHPVER}-fpm start
-              service mysql      start
-              " &>/dev/null &
-  }
+  [[ "$MAXFILESIZE_" != "$CURRENT_FILE_SIZE" ]] && \
+    bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
 
   # redis max memory
   local CONF=/etc/redis/redis.conf

diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
@@ -76,12 +76,7 @@ install()
   [[ ! -f /.ncp-image ]] && {
     systemctl restart redis-server
     systemctl enable  redis-server
-
-    systemctl stop php${PHPVER}-fpm
-    systemctl stop mysql
-    sleep 0.5
-    systemctl start php${PHPVER}-fpm
-    systemctl start mysql
+    systemctl restart php${PHPVER}-fpm
   }
 
   # service to randomize passwords on first boot

diff --git a/etc/ncp-config.d/nc-restore.sh b/etc/ncp-config.d/nc-restore.sh
@@ -161,13 +161,7 @@ bash /usr/local/bin/nextcloud-domain.sh
 
 # restart PHP if needed
 [[ "$NEED_RESTART" == "1" ]] && \
-  bash -c " sleep 3
-            service php${PHPVER}-fpm stop
-            service mysql      stop
-            sleep 0.5
-            service php${PHPVER}-fpm start
-            service mysql      start
-            " &>/dev/null &
+  bash -c " sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
 EOF
   chmod +x /usr/local/bin/ncp-restore
 }