[git.ipfire.org] IPFire 2.x development tree branch, core110, updated. 11685f787310168d7fa8beb581da161718fcc873

[git.ipfire.org] IPFire 2.x development tree branch, core110, updated. 11685f787310168d7fa8beb581da161718fcc873

[git]

[-- Attachment #1: Type: text/plain, Size: 2822 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core110 has been updated
       via  11685f787310168d7fa8beb581da161718fcc873 (commit)
       via  be3d3959d2e7ee03caf40e37993d6a815f8829bf (commit)
       via  ba2247a4b27afc5ae6985a61c65e20dda1a73454 (commit)
       via  2709b42dc4fa904d6103c30a18ba27df2ed84bc7 (commit)
      from  09f518fbb1c0a7db4f2e7202338ecf5ff8ea82c6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11685f787310168d7fa8beb581da161718fcc873
Merge: 09f518f be3d395
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Apr 4 21:32:28 2017 +0200

    Merge remote-tracking branch 'origin/master' into core110

-----------------------------------------------------------------------

Summary of changes:
 config/httpd/server-tuning.conf     | 2 +-
 config/rootfiles/core/110/update.sh | 3 +++
 lfs/openssh                         | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf
index 8f1eae5..9041018 100644
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -20,7 +20,7 @@ KeepAliveTimeout 15
 MinSpareServers 1
 MaxSpareServers 10
 StartServers 2
-MaxClients 1000
+MaxClients 256
 
 #
 # The following directives modify normal HTTP response behavior to
diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
index 84e0ddf..2011d4d 100644
--- a/config/rootfiles/core/110/update.sh
+++ b/config/rootfiles/core/110/update.sh
@@ -44,6 +44,9 @@ ldconfig
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Remove deprecated options
+sed -e "/^RSAAuthentication/d" -i /etc/ssh/sshd_config
+
 # Start services
 /etc/init.d/unbound start
 /etc/init.d/sshd restart
diff --git a/lfs/openssh b/lfs/openssh
index 005e4df..56ac55a 100644
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	sed -i -e 's/^#\?Port .*$$/Port 222/' \
 	    -e 's/^#\?Protocol .*$$/Protocol 2/' \
 	    -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-	    -e 's/^#\?RSAAuthentication .*$$/RSAAuthentication yes/' \
 	    -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
 	    -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
 	    -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \


hooks/post-receive
--
IPFire 2.x development tree