openssh: Introduce include directory for additional sshd config files

This patch adds the prosibility to place additional *.config files in /etc/ssh/sshd_config.d/
which will be included and loaded during the daemon startup process.

Because this files will not be overwritten by any update, they can be used to place custom
or other persistent settings.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/openssh b/config/rootfiles/common/openssh
index f7b479f55194b8c1f7d18b17ce37593a2a32a9b0..d256513485b0b1ed7916ef4042ed6bf225d8e7d4 100644 (file)
--- a/config/rootfiles/common/openssh
+++ b/config/rootfiles/common/openssh
@@ -8,6 +8,7 @@ etc/ssh/ssh_config
 #etc/ssh/ssh_host_rsa_key
 #etc/ssh/ssh_host_rsa_key.pub
 etc/ssh/sshd_config
+etc/ssh/sshd_config.d
 usr/bin/scp
 usr/bin/sftp
 usr/bin/ssh

diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config
index e338f8cef5dba9580e741503933e9985138c708e..ce74cb85102feb1b925e62e635997819a7591e42 100644 (file)
--- a/config/ssh/sshd_config
+++ b/config/ssh/sshd_config
@@ -57,4 +57,7 @@ TCPKeepAlive no
 # Add support for SFTP
 Subsystem      sftp    /usr/lib/openssh/sftp-server
 
+# Include additional sshd config files.
+Include /etc/ssh/sshd_config.d/*.conf
+
 # EOF

diff --git a/lfs/openssh b/lfs/openssh
index c14c8267cf88f2ab644a5ec889bd00fe2d6298c9..b1c9a1635eadd18ef7054010c60b84525ff8a84a 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -91,5 +91,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/ssh/ssh_config \
                /etc/ssh/ssh_config
 
+       # Create directory for additional config
+       # config files.
+       mkdir -pv /etc/ssh/sshd_config.d/
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)