From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 23 Dec 2014 11:43:49 +0000 (+0100)
Subject: vpn-statistic: Move logfiles to /var/run because of flash writes
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87fe47e9d9502276284340475e9c5208ae406571;p=people%2Fms%2Fipfire-2.x.git

vpn-statistic: Move logfiles to /var/run because of flash writes
---

diff --git a/config/collectd/collectd.vpn b/config/collectd/collectd.vpn
index b4d08e0e3b..ca92947f80 100644
--- a/config/collectd/collectd.vpn
+++ b/config/collectd/collectd.vpn
@@ -1,5 +1,5 @@
 LoadPlugin openvpn
 
 <Plugin openvpn>
-StatusFile "/var/log/ovpnserver.log"
+StatusFile "/var/run/ovpnserver.log"
 </Plugin>
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 13ecbd5a9c..67a91a39eb 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -262,7 +262,7 @@ sub writeserverconf {
 	print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n";
     }	
     print CONF "status-version 1\n";
-    print CONF "status /var/log/ovpnserver.log 30\n";
+    print CONF "status /var/run/ovpnserver.log 30\n";
     print CONF "cipher $sovpnsettings{DCIPHER}\n";
     if ($sovpnsettings{'DAUTH'} eq '') {
         print CONF "";
@@ -313,7 +313,7 @@ sub writeserverconf {
 }    
 
 sub emptyserverlog{
-    if (open(FILE, ">/var/log/ovpnserver.log")) {
+    if (open(FILE, ">/var/run/ovpnserver.log")) {
 	flock FILE, 2;
 	print FILE "";
 	close FILE;
@@ -865,7 +865,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General
   print SERVERCONF "dev tun\n"; 
   print SERVERCONF "#Logfile for statistics\n";
   print SERVERCONF "status-version 1\n";
-  print SERVERCONF "status /var/log/openvpn/$cgiparams{'NAME'}-n2n 10\n";
+  print SERVERCONF "status /var/run/openvpn/$cgiparams{'NAME'}-n2n 10\n";
   print SERVERCONF "# Port and Protokol\n"; 
   print SERVERCONF "port $cgiparams{'DEST_PORT'}\n"; 
 
@@ -2840,7 +2840,7 @@ END
     </tr>
 END
 ;
-	my $filename = "/var/log/ovpnserver.log";
+	my $filename = "/var/run/ovpnserver.log";
 	open(FILE, $filename) or die 'Unable to open config file.';
 	my @current = <FILE>;
 	close(FILE);
@@ -4834,7 +4834,7 @@ END
     &General::readhasharray("${General::swroot}/ovpn/caconfig", \%cahash);
     &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
 
-    my @status = `/bin/cat /var/log/ovpnserver.log`;
+    my @status = `/bin/cat /var/run/ovpnserver.log`;
 
     if ($cgiparams{'VPN_IP'} eq '' && -e "${General::swroot}/red/active") {
 		if (open(IPADDR, "${General::swroot}/red/local-ipaddress")) {