From 4a28ee1f534f236d89171d9b55719f16d1873ade Mon Sep 17 00:00:00 2001
From: Romain Dessort <rdessort@evolix.fr>
Date: Fri, 25 Aug 2017 16:58:04 -0400
Subject: [PATCH] Fix op_del() function for containers

---
 scripts/web-add.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/web-add.sh b/scripts/web-add.sh
index 29b3244..6a88cf5 100755
--- a/scripts/web-add.sh
+++ b/scripts/web-add.sh
@@ -561,7 +561,6 @@ op_del() {
     for php_version in ${PHP_VERSIONS[@]}; do
         lxc-attach -n php${php_version} -- userdel -f $login
         lxc-attach -n php${php_version} -- userdel -f www-$login
-        lxc-attach -n php${php_version} -- groupdel $login
     done
     sed -i.bak "/^$login:/d" /etc/aliases
     if [ "$WEB_SERVER" == "apache" ]; then
@@ -585,8 +584,12 @@ op_del() {
         rm /var/lib/lxc/php??/rootfs/etc/php5/fpm/pool.d/${login}.conf /var/lib/lxc/php??/rootfs/etc/php/7.0/fpm/pool.d/${login}.conf
         apache2ctl configtest
         for php_version in ${PHP_VERSIONS[@]}; do
-            lxc-attach -n php${php_version} -- /etc/init.d/php5-fpm restart >/dev/null || true
-            lxc-attach -n php${php_version} -- /etc/init.d/php7.0-fpm restart >/dev/null || true
+            if [ "$php_version" = "70" ]; then
+                initscript_path="/etc/init.d/php7.0-fpm"
+            else
+                initscript_path="/etc/init.d/php5-fpm"
+            fi
+            lxc-attach -n php${php_version} -- $initscript_path restart >/dev/null
         done
     elif [ "$WEB_SERVER" == "nginx" ]; then