From 92a6d92e826f056ae788da902dffb0513f1152df Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Wed, 22 Apr 2015 13:32:04 +0200 Subject: [PATCH 1/2] squid-accounting: fix mistakenly deleted lines from last commit --- src/squid-accounting/acct-lib.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl index 689123584..779ecf810 100644 --- a/src/squid-accounting/acct-lib.pl +++ b/src/squid-accounting/acct-lib.pl @@ -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); } From 0a11f8761ae9464e6321e2259899c3d5ec71a7a4 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Wed, 22 Apr 2015 15:02:02 +0200 Subject: [PATCH 2/2] BUG10812: change ovpnserver config if needed --- config/rootfiles/core/90/update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 5e09240bc..270da2137 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -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