From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 20 Sep 2018 13:51:13 +0000 (+0100)
Subject: core124: Ship updated OpenSSH configuration
X-Git-Tag: v2.21-core124~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d2fe90cc8952879835c3694a6cb8c45b097013c;p=ipfire-2.x.git

core124: Ship updated OpenSSH configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/124/exclude
index d6fd053b6e..b221598781 100644
--- a/config/rootfiles/core/124/exclude
+++ b/config/rootfiles/core/124/exclude
@@ -11,8 +11,6 @@ etc/ipsec.user.secrets
 etc/localtime
 etc/shadow
 etc/snort/snort.conf
-etc/ssh/ssh_config
-etc/ssh/sshd_config
 etc/ssl/openssl.cnf
 etc/sudoers
 etc/sysconfig/firewall.local
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index 9d0d14b644..25e8125939 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -6,6 +6,8 @@ etc/rc.d/init.d/localnet
 etc/rc.d/init.d/networking/red.down/10-static-routes
 etc/rc.d/init.d/partresize
 etc/rc.d/init.d/static-routes
+etc/ssh/ssh_config
+etc/ssh/sshd_config
 etc/sysctl.conf
 etc/unbound/unbound.conf
 opt/pakfire/lib/functions.pl
diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index 88da254e0b..3b5a601d6e 100644
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -95,6 +95,9 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/init.d/rngd restart
 /etc/init.d/ntp restart