webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 04:22:58 +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:
Michael Tremer
2015-04-22 16:08:42 +02:00
parent a4d24f9052 0a11f8761a
commit 07e1b6c0af
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

7
src/squid-accounting/acct-lib.pl
View File

@@ -337,7 +337,12 @@ sub getmonth{
my $monat=$_[0]-1 if($_[0]);
my $tag=1;
my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
my $time2=0;
if (($monat+1) == 12){
$time2=timelocal(0,0,0,$tag,0,$jahr+1);
}else{
$time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
}
--$time2;
return ($time1,$time2);
}