core145: Enable OpenVPN metrics collection

[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 475641d38a589d795f40e2432f97b35f27bca0cb..9ff64f7f9c8a4e9d66cc1743e74415485e3e4143 100644 (file)
--- a/config/rootfiles/core/145/update.sh
+++ b/config/rootfiles/core/145/update.sh
@@ -47,6 +47,8 @@ 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
@@ -63,8 +65,26 @@ 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 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
+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