mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-02 08:12:54 +02:00
Core Update 166: Drop orphaned convert-ovpn script
This script only appeared in conjunction with Core Update 75, released January 2014. Although it is still being executed while restoring a backup, it would only be effective if anyone tried to restore a backup created before C75. I don't think there is a realistic need to carry this script along any further. In doubt, it might be better to start from scratch again rather than trying to restore an 8 year old backup, expecting everything to be peachy and vanilla with it. Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
@@ -92,7 +92,6 @@ usr/local/bin/backupiso
|
|||||||
usr/local/bin/connscheduler
|
usr/local/bin/connscheduler
|
||||||
usr/local/bin/consort.sh
|
usr/local/bin/consort.sh
|
||||||
usr/local/bin/convert-dns-settings
|
usr/local/bin/convert-dns-settings
|
||||||
usr/local/bin/convert-ovpn
|
|
||||||
usr/local/bin/convert-to-location
|
usr/local/bin/convert-to-location
|
||||||
usr/local/bin/filesystem-cleanup
|
usr/local/bin/filesystem-cleanup
|
||||||
usr/local/bin/hddshutdown
|
usr/local/bin/hddshutdown
|
||||||
|
|||||||
@@ -90,7 +90,6 @@ usr/local/bin/backupiso
|
|||||||
usr/local/bin/connscheduler
|
usr/local/bin/connscheduler
|
||||||
usr/local/bin/consort.sh
|
usr/local/bin/consort.sh
|
||||||
usr/local/bin/convert-dns-settings
|
usr/local/bin/convert-dns-settings
|
||||||
usr/local/bin/convert-ovpn
|
|
||||||
usr/local/bin/convert-to-location
|
usr/local/bin/convert-to-location
|
||||||
usr/local/bin/filesystem-cleanup
|
usr/local/bin/filesystem-cleanup
|
||||||
usr/local/bin/hddshutdown
|
usr/local/bin/hddshutdown
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ usr/local/bin/backupiso
|
|||||||
usr/local/bin/connscheduler
|
usr/local/bin/connscheduler
|
||||||
usr/local/bin/consort.sh
|
usr/local/bin/consort.sh
|
||||||
usr/local/bin/convert-dns-settings
|
usr/local/bin/convert-dns-settings
|
||||||
usr/local/bin/convert-ovpn
|
|
||||||
usr/local/bin/convert-to-location
|
usr/local/bin/convert-to-location
|
||||||
usr/local/bin/filesystem-cleanup
|
usr/local/bin/filesystem-cleanup
|
||||||
usr/local/bin/hddshutdown
|
usr/local/bin/hddshutdown
|
||||||
|
|||||||
@@ -293,6 +293,7 @@ rm -rvf \
|
|||||||
/usr/lib/tdbcpostgres1.1.2 \
|
/usr/lib/tdbcpostgres1.1.2 \
|
||||||
/usr/lib/thread2.8.6 \
|
/usr/lib/thread2.8.6 \
|
||||||
/usr/libexec/xtables-addons \
|
/usr/libexec/xtables-addons \
|
||||||
|
/usr/local/bin/convert-ovpn \
|
||||||
/usr/local/bin/ovpn-ccd-convert \
|
/usr/local/bin/ovpn-ccd-convert \
|
||||||
/usr/local/bin/rebuild-initrd \
|
/usr/local/bin/rebuild-initrd \
|
||||||
/usr/local/bin/xt_geoip_build \
|
/usr/local/bin/xt_geoip_build \
|
||||||
|
|||||||
@@ -1,60 +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/>. #
|
|
||||||
# #
|
|
||||||
###############################################################################
|
|
||||||
# #
|
|
||||||
# This script converts old openvpn ccd files with underscore #
|
|
||||||
# to files with spaces to make them working with openvpn 2.3 again #
|
|
||||||
# STEP1: read ovpnconfig and verify cert names #
|
|
||||||
# STEP2: if neccessary convert ccd file #
|
|
||||||
# #
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
require '/var/ipfire/general-functions.pl';
|
|
||||||
|
|
||||||
my %configovpn=();
|
|
||||||
my $ccdpath="/var/ipfire/ovpn/ccd/";
|
|
||||||
my $ovpnconfig="/var/ipfire/ovpn/ovpnconfig";
|
|
||||||
|
|
||||||
&General::readhasharray ($ovpnconfig,\%configovpn);
|
|
||||||
|
|
||||||
&check_config();
|
|
||||||
|
|
||||||
sub check_config {
|
|
||||||
print "Converting CCD files...\n";
|
|
||||||
chdir($ccdpath);
|
|
||||||
|
|
||||||
foreach my $key (sort keys %configovpn){
|
|
||||||
# Skip everything else but roadwarrior connections.
|
|
||||||
next if ($configovpn{$key}[3] ne 'host');
|
|
||||||
|
|
||||||
# Skip all connections with no space in the CN name.
|
|
||||||
next if ($configovpn{$key}[2] !~ " ");
|
|
||||||
|
|
||||||
my $ccdname = $configovpn{$key}[2];
|
|
||||||
$ccdname =~ tr/ /_/;
|
|
||||||
|
|
||||||
# Rename the CCD file if one with the old format exists.
|
|
||||||
if (-e "$ccdname") {
|
|
||||||
print " Renaming $ccdname -> $configovpn{$key}[2]...\n";
|
|
||||||
rename($ccdname, $configovpn{$key}[2]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user