From: Peter Müller <peter.mueller@ipfire.org>
Date: Sat, 19 Feb 2022 00:01:47 +0000 (+0000)
Subject: Drop ovpn-collectd-convert
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf21dcaa979a9a27e946efb8af4ff66ffcf534f3;p=people%2Fms%2Fipfire-2.x.git

Drop ovpn-collectd-convert

This script is orphaned: It was only used while upgrading to Core Update
89, sitting around in /usr/sbin/ doing nothing ever since.

Keeping it there won't do any harm. On the other hand, dragging an
unused script around on our installations does not make sense either.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 521c815c0e..df21dc6eec 100644
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -132,7 +132,6 @@ usr/local/bin/update-location-database
 #usr/local/src
 #usr/sbin
 usr/sbin/openvpn-metrics
-usr/sbin/ovpn-ccd-convert
 usr/sbin/ovpn-collectd-convert
 #usr/share
 #usr/share/doc
diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/common/armv6l/stage2
index 5989bc9a95..df7c3d0f62 100644
--- a/config/rootfiles/common/armv6l/stage2
+++ b/config/rootfiles/common/armv6l/stage2
@@ -132,7 +132,6 @@ usr/local/bin/update-location-database
 #usr/sbin
 usr/sbin/openvpn-metrics
 usr/sbin/ovpn-ccd-convert
-usr/sbin/ovpn-collectd-convert
 #usr/share
 #usr/share/doc
 #usr/share/doc/licenses
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index 0d613f76a1..a1f57aacfb 100644
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -132,7 +132,6 @@ usr/local/bin/update-location-database
 #usr/local/src
 #usr/sbin
 usr/sbin/openvpn-metrics
-usr/sbin/ovpn-ccd-convert
 usr/sbin/ovpn-collectd-convert
 #usr/share
 #usr/share/doc
diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh
index 564f58606a..8899ab7e96 100644
--- a/config/rootfiles/core/165/update.sh
+++ b/config/rootfiles/core/165/update.sh
@@ -91,6 +91,7 @@ rm -rvf \
 	/usr/lib/libxt_ACCOUNT_cl.so* \
 	/usr/lib/python3.8/ \
 	/usr/sbin/iptaccount \
+	/usr/sbin/ovpn-collectd-convert \
 	/usr/sbin/pknlusr \
 	/usr/share/xt_geoip/ \
 	/var/ipfire/firewall/p2protocols
diff --git a/src/scripts/ovpn-collectd-convert b/src/scripts/ovpn-collectd-convert
deleted file mode 100644
index 559985777d..0000000000
--- a/src/scripts/ovpn-collectd-convert
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-my %ovpnconfig=();
-
-require '/var/ipfire/general-functions.pl';
-
-open(COLLECTDVPN, ">${General::swroot}/ovpn/collectd.vpn") or die "Unable to open collectd.vpn: $!";
-print COLLECTDVPN "Loadplugin openvpn\n";
-print COLLECTDVPN "\n";
-print COLLECTDVPN "<Plugin openvpn>\n";
-print COLLECTDVPN "Statusfile \"/var/run/ovpnserver.log\"\n";
-
-&General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig);
-foreach my $key (keys %ovpnconfig) {
-	if ($ovpnconfig{$key}[0] eq 'on' && $ovpnconfig{$key}[3] eq 'net') {
-		print COLLECTDVPN "Statusfile \"/var/run/openvpn/$ovpnconfig{$key}[1]-n2n\"\n";
-	}
-}
-
-print COLLECTDVPN "</Plugin>\n";
-close(COLLECTDVPN);
-
-# Reload collectd afterwards
-system("/usr/local/bin/collectdctrl restart &>/dev/null");