diff --git a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run index f7d375e..ed17f11 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run @@ -33,7 +33,6 @@ echo "${USER_NAME}:${USER_PASSWORD}" | chpasswd # Migration if [[ -f /config/ssh_host_keys/sshd_config ]]; then mv /config/ssh_host_keys/sshd_config /config/sshd/sshd_config - sed -i 's/Include \/etc\/ssh\/sshd_config.d\/\*.conf/#Include \/etc\/ssh\/sshd_config.d\/\*.conf/' /config/sshd/sshd_config echo "This file has been moved to /config/sshd/sshd_config" > /config/ssh_host_keys/sshd_config_README chmod 600 /config/ssh_host_keys/ssh_host_*_key chmod 644 /config/ssh_host_keys/ssh_host_*_key.pub @@ -41,10 +40,11 @@ fi if [[ ! -f /config/sshd/sshd_config ]]; then sed -i '/#PidFile/c\PidFile \/config\/sshd.pid' /etc/ssh/sshd_config - sed -i 's/Include \/etc\/ssh\/sshd_config.d\/\*.conf/#Include \/etc\/ssh\/sshd_config.d\/\*.conf/' /etc/ssh/sshd_config cp -a /etc/ssh/sshd_config /config/sshd/sshd_config fi +sed -i 's/Include \/etc\/ssh\/sshd_config.d\/\*.conf/Include \/config\/sshd\/sshd_config.d\/\*.conf/' /config/sshd/sshd_config + if [[ ! -d /config/ssh_host_keys ]]; then mkdir -p /config/ssh_host_keys ssh-keygen -A