From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Apr 2015 15:11:16 +0000 (+0200)
Subject: openvpn: Remove RRDs when removing all connections at once
X-Git-Tag: v2.17-core89~3^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f36a7b43aa859500994d9bc13f98c17f992c5e4;p=ipfire-2.x.git

openvpn: Remove RRDs when removing all connections at once
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 755589fa52..ed592948fd 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1190,9 +1190,13 @@ SETTINGS_ERROR:
     &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
 
     foreach my $key (keys %confighash) {
+	my $name = $confighash{$cgiparams{'$key'}}[1];
+
 	if ($confighash{$key}[4] eq 'cert') {
 	    delete $confighash{$cgiparams{'$key'}};
 	}
+
+	system ("/usr/local/bin/openvpnctrl -drrd $name");
     }
     while ($file = glob("${General::swroot}/ovpn/ca/*")) {
 	unlink $file;
@@ -1219,11 +1223,6 @@ SETTINGS_ERROR:
     while ($file = glob("${General::swroot}/ovpn/ccd/*")) {
 	unlink $file
     }
-# Delete all RRD files for Roadwarrior connections
-    chdir('/var/ipfire/ovpn/ccd');
-	while ($file = glob("*")) {
-	system ("/usr/local/bin/openvpnctrl -drrd $file");
-	}
     while ($file = glob("${General::swroot}/ovpn/ccd/*")) {
 	unlink $file
     }
@@ -1239,6 +1238,9 @@ SETTINGS_ERROR:
 	system ("rm -rf $file");
     }
 
+    # Remove everything from the collectd configuration
+    &writecollectdconf();
+
     #&writeserverconf();
 ###
 ### Reset all step 1