collectd: Ignore errors from OpenVPN configuration file

[ipfire-2.x.git] / lfs / collectd

diff --git a/lfs/collectd b/lfs/collectd
index f01c92a8a92ba956019f7b13d2ee3d7df10a9f6a..1573e3874d718918914567e6de04b10b8473a3a8 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -101,6 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0020-openvpn-Make-read-functions-robust-like-in-8516f9abb.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch
        cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
+       cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
                --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
                --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
@@ -112,6 +113,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-librrd=/usr/share/rrdtool-1.2.30
        cd $(DIR_APP) && make install
        cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
+       mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
+       chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
+       ln -f -s ../var/ipfire/ovpn/collectd.vpn /etc/collectd.vpn
        ln -f -s ../init.d/collectd /etc/rc.d/rc0.d/K50collectd 
        ln -f -s ../init.d/collectd /etc/rc.d/rc3.d/S29collectd
        ln -f -s ../init.d/collectd /etc/rc.d/rc6.d/K50collectd