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 branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Stefan Schantl
2015-04-22 18:25:25 +02:00
parent b013822b99 07e1b6c0af
commit 851a984121
8 changed files with 139 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/90/filelists/files
View File

@@ -8,6 +8,7 @@ etc/rc.d/rcsysinit.d/S90network-trigger
srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/geoip-block.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/darkdos/include/style.css

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

@@ -172,6 +172,11 @@ if [ ! -e "/var/ipfire/fwhosts/customgeoipgrp" ]; then
chown nobody:nobody /var/ipfire/fwhosts/customgeoipgrp
fi
#Fix BUG10812 (openvpn server.conf has wrong collectd logfile path)
if grep -q "status /var/log/ovpnserver.log 30" /var/ipfire/ovpnserver.conf; then
sed -i "s/\/var\/log\/ovpnserver.log 30/\/var\/run\/ovpnserver.log 30/" /var/ipfire/ovpn/server.conf
fi
# Download/Update GeoIP databases.
/usr/local/bin/xt_geoip_update