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

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

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2316 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  6094f35b5aea86b80e761302f83dc8c09a52b63b (commit)
      from  36c16c71ed854b5bc43b79be926dd1d00f9091ff (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 6094f35b5aea86b80e761302f83dc8c09a52b63b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jan 19 06:10:26 2024 +0000

    core183: generate new rsa before apache start
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

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

Difference in files:
diff --git a/config/rootfiles/core/183/update.sh b/config/rootfiles/core/183/update.sh
index 5930ad324..51483bb7d 100644
--- a/config/rootfiles/core/183/update.sh
+++ b/config/rootfiles/core/183/update.sh
@@ -119,15 +119,6 @@ ldconfig
 chmod -v 750 /etc/sudoers.d
 chmod -v 640 /etc/sudoers.d/*
 
-# Start services
-/etc/rc.d/init.d/apache start
-if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
-	/etc/init.d/sshd start
-fi
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
-	/etc/rc.d/init.d/ipsec start
-fi
-
 # Check apache rsa key and replace if it is too small
 KEYSIZE=$(openssl rsa -in /etc/httpd/server.key -text -noout | sed -n 's/Private-Key:\ (\(.*\)\ bit.*/\1/p')
 if [ $KEYSIZE \< 2048 ]; then
@@ -143,6 +134,16 @@ if [ $KEYSIZE \< 2048 ]; then
 		-out /etc/httpd/server.crt &>/dev/null
 fi
 
+# Start services
+/etc/rc.d/init.d/apache start
+if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
+	/etc/init.d/sshd start
+fi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/rc.d/init.d/ipsec start
+fi
+
+
 # Rebuild initial ramdisks
 dracut --regenerate-all --force
 KVER="xxxKVERxxx"


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