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

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

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 1952 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  cc84ba62f209838b84daa88a938ba29e65d2dce4 (commit)
      from  8f5509c588a96d11f038197244d6aefbe7c8a042 (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 cc84ba62f209838b84daa88a938ba29e65d2dce4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 12 14:11:12 2021 +0000

    core160: apply ssh config, start/stop IPSec and set need_reboot flag
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/160/update.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/160/update.sh b/config/rootfiles/core/160/update.sh
index d422b24aa..a8a8ee307 100644
--- a/config/rootfiles/core/160/update.sh
+++ b/config/rootfiles/core/160/update.sh
@@ -38,6 +38,7 @@ rm -vf /sbin/regdbdump
 rm -vf /usr/lib/libreg.so
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Extract files
 extract_files
@@ -54,10 +55,17 @@ telinit u
 # 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
+	/etc/init.d/ipsec start
+fi
 
 # This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start


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