From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/3] backup.pl: Remove the previous code for adding
 legacty provider to n2n
Date: Sat, 10 Jun 2023 11:16:47 +0100
Message-ID: <3AAAC2AE-27F8-4B57-8104-147744CECA1A@ipfire.org>
In-Reply-To: <20230607142150.18407-2-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0995774704728313036=="
List-Id: <development.lists.ipfire.org>

--===============0995774704728313036==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

I did not merge this, as I believe we need this, because:

We won=E2=80=99t rewrite the OpenVPN configuration files on update, so it mig=
ht be a good idea to just add the line and if someone edits the connection it=
 might be removed.

That should work I believe and -legacy should not have any side effects when =
enabled but not needed.

Best,
-Michael

> On 7 Jun 2023, at 15:21, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - This code is no longer needed with the code in the ovpnmain.cgi patch in =
this patch set.
>=20
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/backup/backup.pl | 15 ---------------
> 1 file changed, 15 deletions(-)
>=20
> diff --git a/config/backup/backup.pl b/config/backup/backup.pl
> index 8d990c0f1..60138a58a 100644
> --- a/config/backup/backup.pl
> +++ b/config/backup/backup.pl
> @@ -190,21 +190,6 @@ restore_backup() {
> # Update OpenVPN CRL
> /etc/fcron.daily/openvpn-crl-updater
>=20
> - # Update OpenVPN N2N Client Configs
> - ## Add providers legacy default line to n2n client config files
> - # Check if ovpnconfig exists and is not empty
> - if [ -s /var/ipfire/ovpn/ovpnconfig ]; then
> -       # Identify all n2n connections
> -       for y in $(awk -F',' '/net/ { print $3 }' /var/ipfire/ovpn/ovpnconf=
ig); do
> -           # Add the legacy option to all N2N client conf files if it does=
 not already exist
> - if [ $(grep -c "Open VPN Client Config" /var/ipfire/ovpn/n2nconf/${y}/${y=
}.conf) -eq 1 ] ; then
> - if [ $(grep -c "providers legacy default" /var/ipfire/ovpn/n2nconf/${y}/$=
{y}.conf) -eq 0 ] ; then
> - echo "providers legacy default" >> /var/ipfire/ovpn/n2nconf/${y}/${y}.conf
> - fi
> - fi
> -       done
> - fi
> -
> return 0
> }
>=20
> --=20
> 2.40.1
>=20


--===============0995774704728313036==--