X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=config%2Frootfiles%2Fcore%2F89%2Fupdate.sh;h=bb6c7a544abaeb1ab8f3fdbcc135a52c0cfd70d0;hp=bc8070948934dcc4185c35f80f25b19d2e3afa7a;hb=8d679040b7798330441c470ae361ec67db00b635;hpb=2f3e47a042ced0b90c448840765c22d3fb1f44a6

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index bc80709489..bb6c7a544a 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -47,7 +47,9 @@ cat <<EOF >> /etc/sysconfig/createfiles
 EOF
 
 # Update /etc/collectd.conf
-echo "include \"/etc/collectd.vpn\"" >> /etc/collectd.conf
+if ! grep -q "collectd.vpn" /etc/collectd.conf; then
+	echo "include \"/etc/collectd.vpn\"" >> /etc/collectd.conf
+fi
 
 # Generate ddns configuration file
 sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
@@ -66,6 +68,19 @@ rm -f \
 	/opt/pakfire/db/*/meta-sqlite \
 	/opt/pakfire/db/rootfiles/sqlite
 
+mkdir -p /var/run/openvpn
+touch /var/run/ovpnserver.log
+chown nobody.nobody \
+	/var/run/openvpn \
+	/var/run/ovpnserver.log
+
+# Update OpenVPN/collectd configuration
+/usr/sbin/ovpn-collectd-convert
+chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
+
+# Fix permissions
+chown nobody.nobody /var/ipfire/dns
+
 # Fix #10625
 mkdir -p /etc/logrotate.d