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/2] update.sh: Fixes Bug#13137 - Existing n2n client
 connection created with openssl-1.1.1x fails to start with openssl-3.x
Date: Mon, 05 Jun 2023 11:32:03 +0100
Message-ID: <F0C42BC1-8434-4FA7-A546-0BEFBC98B7AD@ipfire.org>
In-Reply-To: <20230604185709.8088-2-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5078666141657789565=="
List-Id: <development.lists.ipfire.org>

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

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

We need to consider that people might overwrite this when they restore an old=
er backup.

So I am not sure whether we want those lines added to the backup scripts as w=
ell.

-Michael

> On 4 Jun 2023, at 19:57, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - This modification will check if ovpnconfig exists and is not empty. If so=
 then it will
>   check for all n2n connections and if they are Client configs will check if
>   "providers legacy default" is not already present and if so will add it.
>=20
> Fixes: Bug#13137
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/core/175/update.sh | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>=20
> diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/17=
5/update.sh
> index 5e45c819f..82676bc72 100644
> --- a/config/rootfiles/core/175/update.sh
> +++ b/config/rootfiles/core/175/update.sh
> @@ -177,6 +177,20 @@ if [ -e /boot/pakfire-kernel-update ]; then
>     /boot/pakfire-kernel-update ${KVER}
> fi
>=20
> +## 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 [ $(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
> +
> # This update needs a reboot...
> touch /var/run/need_reboot
>=20
> --=20
> 2.40.1
>=20


--===============5078666141657789565==--