From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Drop orphaned ovpn-ccd-convert script Date: Mon, 21 Mar 2022 08:55:59 +0000 Message-ID: <60274455-7E7F-49E5-B0B4-1CD09DC56D21@ipfire.org> In-Reply-To: <4df694f9-ec14-7dcf-381d-ebcc1a751fd1@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6215427589825031973==" List-Id: --===============6215427589825031973== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thank you for keeping IPFire a tidy place :) > On 19 Mar 2022, at 16:35, Peter M=C3=BCller wr= ote: >=20 > This script appeared in the rootfiles for Core Updates 65 and 66, being > released in late 2012 and early 2013. It is not used elsewhere, and > there is no sense in keeping it around on IPFire installations. >=20 > Should this patch be accepted, a corresponding 'rm' statement is > necessary in the update.sh script of the Core Update it will go into. >=20 > Signed-off-by: Peter M=C3=BCller > --- > config/rootfiles/common/aarch64/stage2 | 1 - > config/rootfiles/common/armv6l/stage2 | 1 - > config/rootfiles/common/x86_64/stage2 | 1 - > lfs/stage2 | 1 - > src/scripts/ovpn-ccd-convert | 71 -------------------------- > 5 files changed, 75 deletions(-) > delete mode 100644 src/scripts/ovpn-ccd-convert >=20 > diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/comm= on/aarch64/stage2 > index d8dc12a7f..e7eae625c 100644 > --- a/config/rootfiles/common/aarch64/stage2 > +++ b/config/rootfiles/common/aarch64/stage2 > @@ -131,7 +131,6 @@ usr/local/bin/update-location-database > #usr/local/src > #usr/sbin > usr/sbin/openvpn-metrics > -usr/sbin/ovpn-ccd-convert > #usr/share > #usr/share/doc > #usr/share/doc/licenses > diff --git a/config/rootfiles/common/armv6l/stage2 b/config/rootfiles/commo= n/armv6l/stage2 > index 42ce447d1..670a99927 100644 > --- a/config/rootfiles/common/armv6l/stage2 > +++ b/config/rootfiles/common/armv6l/stage2 > @@ -129,7 +129,6 @@ usr/local/bin/update-location-database > #usr/local/src > #usr/sbin > usr/sbin/openvpn-metrics > -usr/sbin/ovpn-ccd-convert > #usr/share > #usr/share/doc > #usr/share/doc/licenses > diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/commo= n/x86_64/stage2 > index 70e6c6e75..d07c264b4 100644 > --- a/config/rootfiles/common/x86_64/stage2 > +++ b/config/rootfiles/common/x86_64/stage2 > @@ -131,7 +131,6 @@ usr/local/bin/update-location-database > #usr/local/src > #usr/sbin > usr/sbin/openvpn-metrics > -usr/sbin/ovpn-ccd-convert > #usr/share > #usr/share/doc > #usr/share/doc/licenses > diff --git a/lfs/stage2 b/lfs/stage2 > index 356060a1f..6582a0c1a 100644 > --- a/lfs/stage2 > +++ b/lfs/stage2 > @@ -113,7 +113,6 @@ endif >=20 > # Move script to correct place. > mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/ > - mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/ > mv -vf /usr/local/bin/captive-cleanup /usr/bin/ >=20 > # Install firewall scripts. > diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert > deleted file mode 100644 > index 05339af78..000000000 > --- a/src/scripts/ovpn-ccd-convert > +++ /dev/null > @@ -1,71 +0,0 @@ > -#!/usr/bin/perl > -##########################################################################= ##### > -# = # > -# IPFire.org - A linux based firewall = # > -# Copyright (C) 2007-2022 IPFire Team = # > -# = # > -# 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 . = # > -# = # > -##########################################################################= ##### > - > -my %net=3D(); > -my %ovpnconfig=3D(); > -my @serverconf=3D(); > -my $greennet; > -my $greensubnet; > -my $running=3D'off'; > - > -require '/var/ipfire/general-functions.pl'; > -unless (-d "${General::swroot}/ovpn/ccd") { system("mkdir ${General::swroo= t}/ovpn/ccd"); } > -system ("chown nobody.nobody ${General::swroot}/ovpn/ccd"); > -if ( -e "/var/run/openvpn.pid"){ > - $running=3D'on'; > - system('/usr/local/bin/openvpnctrl', '-k'); > -} > - > -&General::readhash("/var/ipfire/ethernet/settings", \%net); > - $greennet=3D$net{'GREEN_NETADDRESS'}; > - $greensubnet=3D$net{'GREEN_NETMASK'}; > -open(FILE,"/var/ipfire/ovpn/server.conf"); > - while () { > - $_=3D~s/\s*$//g; > - if ($_ ne "route $greennet $greensubnet"){ > - push (@serverconf,$_."\n"); > - }else{ > - print"\nFound ROUTE >>route $greennet $greensubnet<< in server.conf.= . Deleted!"; > - } > - } > - > -&General::readhasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); > -foreach my $key (keys %ovpnconfig){ > - if($ovpnconfig{$key}[32] eq '' && $ovpnconfig{$key}[3] eq 'host'){ > - $ovpnconfig{$key}[2] =3D~ s/ /_/gi; > - open ( CCDRWCONF,'>',"/var/ipfire/ovpn/ccd/$ovpnconfig{$key}[2]") or die= "Unable to create clientconfigfile $!"; > - print CCDRWCONF "# OpenVPN Clientconfig from CCD extension by Copymaster= #\n\n"; > - print CCDRWCONF "#This client uses the dynamic pool\n\n"; > - print CCDRWCONF "\n#Client gets routes to these Networks (behind IPFIRE)= \n"; > - print CCDRWCONF "push \"route $greennet $greensubnet\"\n"; > - close CCDRWCONF; > - print"Client $ovpnconfig{$key}[2] converted! \n"; > - }else{ > - print "Client $ovpnconfig{$key}[2] NOT converted!\n"; > - } > - $ovpnconfig{$key}[32] =3D 'dynamic' if ($ovpnconfig{$key}[32] eq ''); > -} > -&General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); > -if ($running eq 'on') > -{ > - system('/usr/local/bin/openvpnctrl', '-s'); > -} > -system ("chown nobody:nobody /var/ipfire/ovpn/ccd/*"); > --=20 > 2.34.1 --===============6215427589825031973==--