Merge remote-tracking branch 'origin/master' into next

config/rootfiles/core/89/update.sh

@@ -68,10 +68,31 @@ rm -f \
 	/opt/pakfire/db/*/meta-sqlite \
 	/opt/pakfire/db/rootfiles/sqlite
 
+mkdir -p /var/run/openvpn
+touch /var/run/ovpnserver.log
+chown nobody.nobody \
+	/var/run/openvpn \
+	/var/run/ovpnserver.log
+
 # Update OpenVPN/collectd configuration
+files=`find /var/ipfire/ovpn/n2nconf/ -type d`
+for i in $files;
+do
+	if ! grep -q "status-version" $i/${i##*/}.conf; then
+		echo "# Logfile" >> $i/${i##*/}.conf
+		echo "status-version 1" >> $i/${i##*/}.conf
+	fi
+	if ! grep -q "status " $i/${i##*/}.conf; then
+		echo "status /var/run/openvpn/${i##*/}-n2n 10" >> $i/${i##*/}.conf
+	fi
+done
+
 /usr/sbin/ovpn-collectd-convert
 chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
 
+# Fix permissions
+chown nobody.nobody /var/ipfire/dns
+
 # Fix #10625
 mkdir -p /etc/logrotate.d
 

html/cgi-bin/netovpnrw.cgi

@@ -59,7 +59,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){
 	if(@vpns){
 		foreach (@vpns) {
 			&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
-			&Graphs::makegraphbox("netovpnrw.cgi",$_,"week");
+			&Graphs::makegraphbox("netovpnrw.cgi",$_, "day");
 			&Header::closebox();
 		}
 	}else{

html/cgi-bin/netovpnsrv.cgi

@@ -59,7 +59,7 @@ if ( $querry[0] ne ""){
 	if (@vpns){
 		foreach (@vpns) {
 			&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
-			&Graphs::makegraphbox("netovpnsrv.cgi",$_,"week");
+			&Graphs::makegraphbox("netovpnsrv.cgi",$_, "day");
 			&Header::closebox();
 		}
 	}else{

src/patches/collectd/silence-openvpn-errors.patch

@@ -1,8 +1,28 @@
 diff --git a/src/openvpn.c b/src/openvpn.c
-index d446e9957b68..cc33eed61e25 100644
+index d446e9957b68..ef5bf1078285 100644
 --- a/src/openvpn.c
 +++ b/src/openvpn.c
-@@ -567,7 +567,7 @@ static int openvpn_read (void)
+@@ -70,6 +70,7 @@ static const char *config_keys[] =
+ };
+ static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
+ 
++static int version_detect (const char *filename);
+ 
+ /* Helper function
+  * copy-n-pasted from common.c - changed delim to ","  */
+@@ -540,6 +541,11 @@ static int openvpn_read (void)
+ 			continue;
+ 		}
+ 
++		// If the version was not detected yet, we try to guess again
++		if (vpn_list[i]->version == 0) {
++			vpn_list[i]->version = version_detect(vpn_list[i]->file);
++		}
++
+ 		switch (vpn_list[i]->version)
+ 		{
+ 			case SINGLE:
+@@ -567,7 +573,7 @@ static int openvpn_read (void)
  		read += vpn_read;
  	}
  
@@ -11,3 +31,34 @@ index d446e9957b68..cc33eed61e25 100644
  } /* int openvpn_read */
  
  static int version_detect (const char *filename)
+@@ -630,16 +636,6 @@ static int version_detect (const char *filename)
+ 		}
+ 	}
+ 
+-	if (version == 0)
+-	{
+-		/* This is only reached during configuration, so complaining to
+-		 * the user is in order. */
+-		NOTICE ("openvpn plugin: %s: Unknown file format, please "
+-				"report this as bug. Make sure to include "
+-				"your status file, so the plugin can "
+-				"be adapted.", filename);
+-	}
+-
+ 	fclose (fh);
+ 
+ 	return version;
+@@ -656,13 +652,6 @@ static int openvpn_config (const char *key, const char *value)
+ 		/* try to detect the status file format */
+ 		status_version = version_detect (value);
+ 
+-		if (status_version == 0)
+-		{
+-			WARNING ("openvpn plugin: unable to detect status version, \
+-					discarding status file \"%s\".", value);
+-			return (1);
+-		}
+-
+ 		status_file = sstrdup (value);
+ 		if (status_file == NULL)
+ 		{