docker: replace systemd for service

nextcloud · Jun 18, 2018 · 7ac1847 · 7ac1847
1 parent a4fb4f7
commit 7ac1847
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,13 @@
 
-[v0.57.0](https://github.com/nextcloud/nextcloudpi/commit/2591f25) (2018-06-18) update to NC 13.0.4
+[v0.57.1](https://github.com/nextcloud/nextcloudpi/commit/5483031) (2018-06-18) nc-limits: replace systemd for service
+
+[v0.57.0](https://github.com/nextcloud/nextcloudpi/commit/ef5839d) (2018-06-18) update to NC 13.0.4
 
 [v0.56.25](https://github.com/nextcloud/nextcloudpi/commit/fe16326) (2018-06-18) nc-snapshot-sync: upgrade
 
 [v0.56.24](https://github.com/nextcloud/nextcloudpi/commit/16ce683) (2018-06-18) nc-datadir: make sure we have the correct permissions
 
-[v0.56.23, master](https://github.com/nextcloud/nextcloudpi/commit/0a047a1) (2018-06-18) nc-info: fix typo
+[v0.56.23](https://github.com/nextcloud/nextcloudpi/commit/0a047a1) (2018-06-18) nc-info: fix typo
 
 [v0.56.22](https://github.com/nextcloud/nextcloudpi/commit/96e9f20) (2018-06-14) nc-restore: fix redis restart in docker
 

diff --git a/etc/ncp-config.d/nc-limits.sh b/etc/ncp-config.d/nc-limits.sh
@@ -30,16 +30,16 @@ configure()
 
   # need to restart php
   bash -c " sleep 3
-            systemctl stop php7.0-fpm
-            systemctl stop mysqld
+            service php7.0-fpm stop
+            service mysqld     stop
             sleep 0.5
-            systemctl start php7.0-fpm
-            systemctl start mysqld
+            service php7.0-fpm start
+            service mysqld     start
             " &>/dev/null &
 
   # redis max memory
   sed -i "s|maxmemory .*|maxmemory $REDISMEM_|" /etc/redis/redis.conf
-  systemctl restart redis
+  service redis restart
 }
 
 install() { :; }

diff --git a/etc/ncp-config.d/nc-nextcloud.sh b/etc/ncp-config.d/nc-nextcloud.sh
@@ -73,11 +73,11 @@ install()
     systemctl enable  redis-server
 
     # need to restart php
-    systemctl stop php7.0-fpm
-    systemctl stop mysqld
+    service php7.0-fpm stop
+    service mysqld     stop
     sleep 0.5
-    systemctl start php7.0-fpm
-    systemctl start mysqld
+    service php7.0-fpm start
+    service mysqld     start
   }
 
   # 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
@@ -158,11 +158,11 @@ bash /usr/local/bin/nextcloud-domain.sh
 # restart PHP if needed
 [[ "$NEED_RESTART" == "1" ]] && \
   bash -c " sleep 3
-            systemctl stop php7.0-fpm
-            systemctl stop mysqld
+            service php7.0-fpm stop
+            service mysqld     stop
             sleep 0.5
-            systemctl start php7.0-fpm
-            systemctl start mysqld
+            service php7.0-fpm start
+            service mysqld     start
             " &>/dev/null &
 EOF
   chmod +x /usr/local/bin/ncp-restore