diff --git a/setup.sh b/setup.sh index 1868453..62ca6fd 100644 --- a/setup.sh +++ b/setup.sh @@ -126,9 +126,11 @@ configure_ssh() { printf \"%s\n\" \"$SSH_KEY\" > \"/home/$USERNAME/.ssh/authorized_keys\" chmod 600 \"/home/$USERNAME/.ssh/authorized_keys\" chown -R \"$USERNAME\":\"$USERNAME\" \"/home/$USERNAME/.ssh\" - if ! grep -qE \"^[[:space:]]*Include[[:space:]]+/etc/ssh/sshd_config.d/\\*.conf\" /etc/ssh/sshd_config; then - echo \"Include /etc/ssh/sshd_config.d/*.conf\" >> /etc/ssh/sshd_config + sshd_conf=/etc/ssh/sshd_config + if grep -qE \"^[[:space:]]*Include[[:space:]]+/etc/ssh/sshd_config.d/\\*.conf\" \"\$sshd_conf\"; then + sed -i \"/^[[:space:]]*Include[[:space:]]+\/etc\/ssh\/sshd_config\\.d\/\\*.conf/d\" \"\$sshd_conf\" fi + echo \"Include /etc/ssh/sshd_config.d/*.conf\" >> \"\$sshd_conf\" install -d -m 755 /etc/ssh/sshd_config.d dir=/etc/ssh/sshd_config.d shopt -s nullglob