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 d6fd053b6eb6108a7776ec908ba20f3ccae5347f..b221598781717c4568a58f0bfcff78c0c4942563 100644 (file)
--- 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/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
 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 9d0d14b644a2fa2f79272a4e5e9f450753534f10..25e812593956480aff1a58c8cddc8d3b3f87772f 100644 (file)
--- 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/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
 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 88da254e0b84857d1a91cb14217aa54c4b02a0d5..3b5a601d6eb9dac80dbb854ba3570d00fd7308e1 100644 (file)
--- 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
 
 # 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
 # Start services
 /etc/init.d/rngd restart
 /etc/init.d/ntp restart