[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0aad107b540d9b716218b6035de24a776ef6322

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0aad107b540d9b716218b6035de24a776ef6322

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2821 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, next has been updated
       via  e0aad107b540d9b716218b6035de24a776ef6322 (commit)
       via  a9f69cbf01cd306dbc20c5761eedcdd97bc492e8 (commit)
       via  5e4126c33b8bb031a3358333d10cb03f8f377c9b (commit)
       via  d328c232d7df7bf3f8582388f428c47a92fab0c1 (commit)
      from  5e4f76bb714fda3b87b0fe58663d3cc353200362 (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 e0aad107b540d9b716218b6035de24a776ef6322
Merge: 5e4f76bb7 a9f69cbf0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Oct 10 11:49:07 2020 +0000

    Merge branch 'master' into next

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

Summary of changes:
 config/rootfiles/oldcore/151/update.sh | 3 +++
 html/cgi-bin/credits.cgi               | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh
index 16135b2ef..699528274 100644
--- a/config/rootfiles/oldcore/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@ -50,6 +50,9 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
 /etc/init.d/sshd restart
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index fe838157f..cc0b958ce 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Christian Schmidt,
 Alexander Marx,
 Matthias Fischer,
 Peter Müller,
-Erik Kapfer,
 Jan Paul Tücking,
+Erik Kapfer,
 Jonatan Schlag,
 Dirk Wagner,
 Marcel Lorenz,
@@ -82,10 +82,9 @@ Stephan Feddersen,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
-Stéphane Pautrel,
 Ersan Yildirim,
 Jörn-Ingo Weigert,
-Adolf Belka,
+Stéphane Pautrel,
 Alexander Koch,
 Wolfgang Apolinarski,
 Alfred Haas,
@@ -97,11 +96,11 @@ Florian Bührle,
 Bernhard Bitsch,
 Justin Luth,
 Michael Eitelwein,
+Adolf Belka,
 Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
-Marcel Follert,
 Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
@@ -129,6 +128,7 @@ Julian McConnell,
 Kay-Michael Köhler,
 Kim Wölfel,
 Logan Schmidt,
+Marcel Follert,
 Markus Untersee,
 Mathew McBride,
 Nico Prenzel,


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