[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 758d959652ee8fbc018b04d75624ec61ed64e227

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 5922 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  758d959652ee8fbc018b04d75624ec61ed64e227 (commit)
       via  daf34294f233a414cd14d08b1269b8192b591096 (commit)
       via  18bbd71bdcc95b7f335061aa22e61c39df912e8c (commit)
       via  8d679040b7798330441c470ae361ec67db00b635 (commit)
       via  5c5b4000b9053d8bf993d5d0a87393f7540786c9 (commit)
       via  9aeac09636461df05f2423b65f7e0dc476eb0eb9 (commit)
       via  01c82dbaa325336698b3c826ba0ba451b90eefe0 (commit)
      from  96737543858a2d78d61da981dd10c5e9a3b671a4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 758d959652ee8fbc018b04d75624ec61ed64e227
Merge: 9673754 daf3429
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Apr 13 17:11:41 2015 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/89/update.sh                | 21 +++++++++
 html/cgi-bin/netovpnrw.cgi                        |  2 +-
 html/cgi-bin/netovpnsrv.cgi                       |  2 +-
 src/patches/collectd/silence-openvpn-errors.patch | 55 ++++++++++++++++++++++-
 4 files changed, 76 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 832feaa..90a6d77 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/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
 
diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi
index e0b1148..fed6d4d 100755
--- a/html/cgi-bin/netovpnrw.cgi
+++ b/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{
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index f843462..ddf4177 100755
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/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{
diff --git a/src/patches/collectd/silence-openvpn-errors.patch b/src/patches/collectd/silence-openvpn-errors.patch
index c909761..c258486 100644
--- a/src/patches/collectd/silence-openvpn-errors.patch
+++ b/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)
+ 		{


hooks/post-receive
--
IPFire 2.x development tree