Corrections: etc/nsd/zone.d/* - Champ SPF déprécié

[lhc/ateliers.git] / local / dovecot-user-del

diff --git a/local/dovecot-user-del b/local/dovecot-user-del
index 513f7aa..e078e9d 100755 (executable)
--- a/local/dovecot-user-del
+++ b/local/dovecot-user-del
@@ -9,8 +9,8 @@ tool=$(readlink -e "${0%/*}/..")
 IFS=@ read -r user domain <<-EOF
        $1
        EOF
-test "${user:+set"}"
-test "${domain:+set"}"
+test "${user:+set}"
+test "${domain:+set}"
 shift
 
 # setup_postfix
@@ -67,7 +67,7 @@ shift
                 done 4<<-EOF 3>&1 >&2 |
                        $(sudo cat "$old_passwd")
                        EOF
-               sudo install -o php5_roundcube -g php5_roundcube -m 0640 /dev/stdin "$new_passwd"
+               sudo install -o php_roundcube -g php_roundcube -m 0640 /dev/stdin "$new_passwd"
                sudo mv -f "$new_passwd" "$old_passwd"
         fi
 # setup_nss
@@ -78,8 +78,8 @@ shift
                        getent passwd "$user"
                 then
                        sudo deluser "$user" "$domain_group"
+                       sudo delgroup "$domain_group"
                 fi
-               sudo delgroup "$domain_group"
         fi
 # setup_dirs
        if test "${purge:+set}"
@@ -100,7 +100,7 @@ shift
 # setup_roundcube
        if test "${purge:+set}"
         then
-               sudo -u php5_roundcube psql -1AqtX --set ON_ERROR_STOP=1 -U roundcube roundcube <<-EOF
+               sudo -u php_roundcube psql -1AqtX --set ON_ERROR_STOP=1 -U roundcube roundcube <<-EOF
                        DO LANGUAGE plpgsql \$\$
                                DECLARE uid integer;
                        BEGIN