core145: Remove double-added configuration lines for OpenVPN

[ipfire-2.x.git] / config / rootfiles / core / 145 / update.sh

diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh
index afddeae0d879f79135a942183d4799bb421fea58..4b59a03dc7f684bc97d9a82b21a4a52aed1b4de8 100644 (file)
--- a/config/rootfiles/core/145/update.sh
+++ b/config/rootfiles/core/145/update.sh
@@ -47,6 +47,12 @@ done
 
 # Stop services
 /etc/init.d/vnstat stop
+/etc/init.d/squid stop
+/etc/init.d/suricata stop
+
+# Prepare OpenVPN for update
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Extract files
 extract_files
@@ -59,8 +65,37 @@ rm /etc/rc.d/rc0.d/K45random
 rm /etc/rc.d/rc6.d/K45random
 mv /etc/rc.d/rc3.d/S00random /etc/rc.d/rcsysinit.d/S66random
 mv /etc/rc.d/rcsysinit.d/S92rngd /etc/rc.d/rcsysinit.d/S65rngd
+
+# remove converted urlfilter database to force rebuilt
+rm -f /var/ipfire/urlfilter/blacklists/*/*.db
+rm -f /var/ipfire/urlfilter/blacklists/*/*/*.db
+
+# remove packages that are included now in core
+for package in perl-DBI perl-DBD-SQLite; do
+        rm -f /opt/pakfire/db/installed/meta-$package
+        rm -f /opt/pakfire/db/meta/meta-$package
+        rm -f /opt/pakfire/db/rootfiles/$package
+done
+
+# Enable OpenVPN metrics collection
+sed -E -i /var/ipfire/ovpn/server.conf \
+       -e "/^client-(dis)?connect/d"
+
+cat <<EOF >> /var/ipfire/ovpn/server.conf
+# Log clients connecting/disconnecting
+client-connect "/usr/sbin/openvpn-metrics client-connect"
+client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"
+EOF
+
 # Start services
 /etc/init.d/vnstat start
+/etc/init.d/unbound restart
+/etc/init.d/suricata start
+/etc/init.d/squid start
+
+# Start OpenVPN again
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # Update Language cache
 /usr/local/bin/update-lang-cache