From e15e03c36b7d3654b77c35dbe4454dac77428264 Mon Sep 17 00:00:00 2001
From: Nicolas Roman <nroman@evolix.fr>
Date: Tue, 26 Mar 2019 12:06:07 +0100
Subject: [PATCH] enhance enable/disable for itk

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

diff --git a/scripts/web-add.sh b/scripts/web-add.sh
index a40ed95..f842275 100755
--- a/scripts/web-add.sh
+++ b/scripts/web-add.sh
@@ -787,7 +787,6 @@ arg_processing() {
 }
 
 op_listvhost() {
-    # cas pour afficher usage à faire
     if [ $# -eq 1 ]; then
         configlist="$VHOST_PATH/${1}.conf";
     else
@@ -902,7 +901,7 @@ op_listuseritk() {
     domain=${1}
     configfile="$VHOST_PATH"/"${2}".conf
 
-    sed -n "/$domain/,/<\/VirtualHost>/p" $configfile | awk '/AssignUserID/ {print $2}'
+    sed -n "/$domain/,/<\/VirtualHost>/p" $configfile | awk '/AssignUserID/ {print $2}' | uniq
   else usage
   fi
 }
@@ -912,9 +911,12 @@ op_enableuseritk() {
     domain=${1}
     configfile="$VHOST_PATH"/"${2}".conf
     user=$(op_listuseritk "${1}" "${2}")
-    echo $user
 
-    sed -i "/^ *AssignUserID ${user}/ s/${user}/www-${user}/" $VHOST_PATH/"${2}".conf --follow-symlinks
+    sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID $user/    AssignUserID www-$user/" $configfile --follow-symlinks
+
+    apache2ctl configtest 2>/dev/null
+    /etc/init.d/apache2 force-reload >/dev/null
+
   else usage
   fi
 }
@@ -924,8 +926,12 @@ op_disableuseritk() {
     domain=${1}
     configfile="$VHOST_PATH"/"${2}".conf
     user=$(op_listuseritk "${1}" "${2}")
-    echo $user
-    sed -i "/^ *AssignUserID ${user}/ s/${user}/${user:4}/" $VHOST_PATH/"${2}".conf --follow-symlinks
+
+    sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID $user/    AssignUserID ${user:4}/" $configfile --follow-symlinks
+
+    apache2ctl configtest 2>/dev/null
+    /etc/init.d/apache2 force-reload >/dev/null
+
   else usage
   fi
 }