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

diff --git a/config/collectd/collectd.vpn b/config/collectd/collectd.vpn
index b4d08e0e3b0a1f158b311998f8d124f93305063f..ca92947f804db750d768fbc2e59d59bd0bd36900 100644 (file)
--- 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 13ecbd5a9c1fb8381047f06686c5ac62a6ddc082..67a91a39eb27e8950592ae85670dbbe1ef93a506 100644 (file)
--- 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")) {