Core Update 173: Ship openvpn-authenticator and restart OpenVPN

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/core/173/filelists/files b/config/rootfiles/core/173/filelists/files
index dc49dc654b3897fd67f87c317ea7de4cb438e841..ae9737361d66492bc6ee296f1f1802b73ea3ee6d 100644 (file)
--- a/config/rootfiles/core/173/filelists/files
+++ b/config/rootfiles/core/173/filelists/files
@@ -151,4 +151,5 @@ lib/firmware/qca/rampatch_usb_00190200.bin
 lib/udev/network-hotplug-rename
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/pppsetup.cgi
+usr/sbin/openvpn-authenticator
 var/ipfire/dhcpc/dhcpcd.conf

diff --git a/config/rootfiles/core/173/update.sh b/config/rootfiles/core/173/update.sh
index 9b2ca515736b17f0e61c42e8ac5a5444440bdf1e..ebf583ea371fa06393301c029beed4e523c787a5 100644 (file)
--- a/config/rootfiles/core/173/update.sh
+++ b/config/rootfiles/core/173/update.sh
@@ -44,6 +44,8 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 KVER="xxxKVERxxx"
 
@@ -98,6 +100,10 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Start services
+if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then
+       /usr/local/bin/openvpnctrl -s
+       /usr/local/bin/openvpnctrl -sn2n
+fi
 
 # Regenerate all initrds
 dracut --regenerate-all --force