diff --git a/scripts/web-add.sh b/scripts/web-add.sh index b92f25d..1870054 100755 --- a/scripts/web-add.sh +++ b/scripts/web-add.sh @@ -284,7 +284,17 @@ create_www_account() { lxc-attach -n php${php_version} -- /usr/sbin/adduser --disabled-password --home $HOME_DIR_USER/www --no-create-home --shell /bin/false --gecos "WWW $in_login" www-$in_login --uid $www_uid --ingroup $in_login --force-badname >/dev/null done - sed -i "s/^AllowUsers .*/& $in_login/" /etc/ssh/sshd_config + if grep -qE '^AllowGroups' /etc/ssh/sshd_config; then + if ! grep -qE "^AllowGroups(\s+\S+)*(\s+evoadmin-ssh)" /etc/ssh/sshd_config; then + sed -i "s/^AllowGroups .*/& evoadmin-ssh/" /etc/ssh/sshd_config + groupadd --force evoadmin-ssh + fi + usermod -a -G evoadmin-ssh "$in_login" + else + if grep -qE '^AllowUsers' /etc/ssh/sshd_config; then + sed -i "s/^AllowUsers .*/& $in_login/" /etc/ssh/sshd_config + fi + fi /etc/init.d/ssh reload step_ok "Création des utilisateurs" @@ -567,9 +577,11 @@ op_del() { sed -i.bak "/^www-$login:/d" /etc/aliases fi - sed -i "s/^\(AllowUsers .*\)$login/\1/" /etc/ssh/sshd_config - /etc/init.d/ssh reload - + if grep -qE '^AllowUsers' /etc/ssh/sshd_config; then + sed -i "s/^AllowUsers .*/& $in_login/" /etc/ssh/sshd_config + /etc/init.d/ssh reload + fi + if [ -d "$HOME_DIR/$login" ]; then mv -i $HOME_DIR/$login $HOME_DIR/$login.`date '+%Y%m%d-%H%M%S'`.bak else