webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13: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-13 17:11:41 +02:00
parent 9673754385 daf34294f2
commit 758d959652
4 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,10 +68,31 @@ 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
files=`find /var/ipfire/ovpn/n2nconf/ -type d`
for i in $files;
do
if ! grep -q "status-version" $i/${i##*/}.conf; then
echo "# Logfile" >> $i/${i##*/}.conf
echo "status-version 1" >> $i/${i##*/}.conf
fi
if ! grep -q "status " $i/${i##*/}.conf; then
echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
fi
done
/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