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 cf21dcaa979a9a27e946efb8af4ff66ffcf534f3 (commit) from 66c3619872bcf723d7bac550165ad5658de95644 (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 cf21dcaa979a9a27e946efb8af4ff66ffcf534f3 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Feb 19 00:01:47 2022 +0000

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

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

Summary of changes: config/rootfiles/common/aarch64/stage2 | 1 - config/rootfiles/common/armv6l/stage2 | 1 - config/rootfiles/common/x86_64/stage2 | 1 - config/rootfiles/core/165/update.sh | 1 + src/scripts/ovpn-collectd-convert | 43 ---------------------------------- 5 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/scripts/ovpn-collectd-convert

Difference in files: diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2 index 521c815c0..df21dc6ee 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 5989bc9a9..df7c3d0f6 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 0d613f76a..a1f57aacf 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 564f58606..8899ab7e9 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 559985777..000000000 --- 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");

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