core89: Move converter to the end because collectd should be restarted at last

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

diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index f3de863ec5aa311f5b2bf8363ea6909833a32ef9..bb6c7a544abaeb1ab8f3fdbcc135a52c0cfd70d0 100644 (file)
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -35,10 +35,22 @@ done
 /etc/init.d/ipsec stop
 
 # Remove old files
+rm -f /usr/local/sbin/setup
 
 # Extract files
 extract_files
 
+# Update /etc/sysconfig/createfiles
+cat <<EOF >> /etc/sysconfig/createfiles
+/var/run/ovpnserver.log file    644     nobody  nobody
+/var/run/openvpn        dir     644     nobody  nobody
+EOF
+
+# Update /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
 
@@ -56,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