webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-04-12 22:53:06 +02:00
parent 040ec360f9 abd93c4241
commit d4ee6f0813
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/core/89/update.sh
View File

@@ -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
@@ -68,6 +70,7 @@ rm -f \
# Update OpenVPN/collectd configuration
/usr/sbin/ovpn-collectd-convert
chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
# Fix #10625
mkdir -p /etc/logrotate.d