From d3e5cc7b4cf09c76aec2fa3bf02366c912a3762a Mon Sep 17 00:00:00 2001 From: Nicolas Roman Date: Tue, 26 Mar 2019 17:46:31 +0100 Subject: [PATCH] fix case when using multiple time disable-user-itk and enable-user-itk --- scripts/web-add.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/web-add.sh b/scripts/web-add.sh index f842275..5b243f5 100755 --- a/scripts/web-add.sh +++ b/scripts/web-add.sh @@ -910,9 +910,9 @@ op_enableuseritk() { if [ $# -eq 2 ]; then domain=${1} configfile="$VHOST_PATH"/"${2}".conf - user=$(op_listuseritk "${1}" "${2}") + group=$(sed -n "/$domain/,/<\/VirtualHost>/p" $configfile | awk '/AssignUserID/ {print $3}' | uniq) - sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID $user/ AssignUserID www-$user/" $configfile --follow-symlinks + sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID $group/ AssignUserID www-$group/" $configfile --follow-symlinks apache2ctl configtest 2>/dev/null /etc/init.d/apache2 force-reload >/dev/null @@ -925,9 +925,9 @@ op_disableuseritk() { if [ $# -eq 2 ]; then domain=${1} configfile="$VHOST_PATH"/"${2}".conf - user=$(op_listuseritk "${1}" "${2}") + group=$(sed -n "/$domain/,/<\/VirtualHost>/p" $configfile | awk '/AssignUserID/ {print $3}' | uniq) - sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID $user/ AssignUserID ${user:4}/" $configfile --follow-symlinks + sed -i "/$domain/,/<\/VirtualHost>/ s/^ *AssignUserID www-$group/ AssignUserID ${group}/" $configfile --follow-symlinks apache2ctl configtest 2>/dev/null /etc/init.d/apache2 force-reload >/dev/null