Merge pull request #106 from tg123/confgd

Author: thespad

readme-vars.yml

@@ -115,6 +115,7 @@ init_diagram: |
   "openssh-server:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "10.02.25:", desc: "Add support for sshd_config.d"}
   - {date: "12.01.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "24.11.24:", desc: "Move sshd_config to /config/sshd/sshd_config."}
   - {date: "31.05.24:", desc: "Rebase to Alpine 3.20."}

root/etc/s6-overlay/s6-rc.d/init-openssh-server-config/run

@@ -51,6 +51,12 @@ if [[ ! -d /config/ssh_host_keys ]]; then
     cp /etc/ssh/ssh_host_* /config/ssh_host_keys
 fi
 
+# Enable sshd_config.d if mounted 
+if [[ -d /config/sshd/sshd_config.d ]]; then 
+    sed -i 's/Include \/etc\/ssh\/sshd_config.d\/\*.conf/Include \/config\/sshd\/sshd_config.d\/\*.conf/' /config/sshd/sshd_config 
+    sed -i '/Include \/config\/sshd\/sshd_config.d/s/^#*//' /config/sshd/sshd_config 
+fi
+
 # display SSH host public key(s)
 echo "SSH host public key(s):"
 cat /config/ssh_host_keys/ssh_host_*.pub