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

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

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 2532 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  b029818d1ad011837dee87724c1bad8762368833 (commit)
       via  492c9fb64b8744fca6a8f403dd3741f12a417397 (commit)
      from  79fb08749b6d9304818d3bada92302cdfab682c0 (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 b029818d1ad011837dee87724c1bad8762368833
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 20:24:50 2022 +0000

    Core Update 171: Stop and restart collectd
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 492c9fb64b8744fca6a8f403dd3741f12a417397
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Sun Sep 18 20:21:24 2022 +0000

    Fix restarting Squid and OpenVPN during Core Update 171
    
    My fault, again. :-/
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/171/update.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 48fd742b5..86efc8afc 100644
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -34,8 +34,10 @@ done
 # Stop services
 /etc/rc.d/init.d/apache stop
 /etc/rc.d/init.d/squid stop
-/etc/rc.d/init.d/openvpn stop
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 /etc/rc.d/init.d/ipsec stop
+/etc/rc.d/init.d/collectd stop
 
 # Remove files
 rm -rvf \
@@ -149,14 +151,16 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
+/etc/rc.d/init.d/collectd start
 /etc/rc.d/init.d/apache start
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
-	/etc/init.d/openvpn start
+	/usr/local/bin/openvpnctrl -s
+	/usr/local/bin/openvpnctrl -sn2n
 fi
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec start
 fi
-if -f /var/ipfire/proxy/enable; then
+if [ -f /var/ipfire/proxy/enable ]; then
 	/etc/init.d/squid start
 fi
 


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