webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop ovpn-collectd-convert

Browse Source 
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>
This commit is contained in:
Peter Müller
2022-02-19 00:01:47 +00:00
parent 66c3619872
commit cf21dcaa97
5 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/aarch64/stage2
View File

@@ -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

1
config/rootfiles/common/armv6l/stage2
View File

@@ -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

1
config/rootfiles/common/x86_64/stage2
View File

@@ -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

1
config/rootfiles/core/165/update.sh
View File

@@ -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

43
src/scripts/ovpn-collectd-convert
View File

@@ -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");