From patchwork Wed Jun 7 14:21:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6933 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QbqKm0Z0Mz3wgN for ; Wed, 7 Jun 2023 14:22:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QbqKg64dkz3qM; Wed, 7 Jun 2023 14:21:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QbqKg3dGpz2ykQ; Wed, 7 Jun 2023 14:21:59 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QbqKd1mfPz2ykQ for ; Wed, 7 Jun 2023 14:21:57 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QbqKc6glHz1Cb; Wed, 7 Jun 2023 14:21:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1686147717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFgp3NI6MWZQF65uGtiGwMubRSqy55pMBJ6rTxrUoew=; b=ivmCJrrkR3cd63lqdT3GgTrEhqoyUzXxXudtUFwEjJ3jTW/wJCj2heNbechvoJn2uR/sck bEtR01Qhi450gQBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1686147717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFgp3NI6MWZQF65uGtiGwMubRSqy55pMBJ6rTxrUoew=; b=e6TqvCsaJFF661X91q/niH5PlXRjE0ux73+u940lih0YuIHi2ljpmar8d4/ZItcBXQ+JD9 G12vj16cXxxH1rJrDFhJmaq6dHW3jbGxqBqcVdnCf1jRVQ9MUGktC4454+4iJE+bQwwUoE EHr5SdXxAOyGdvpIHJw7sc2M2Shx3fhQsImZ+109+H+yyuMxCbu9OjtHpvjbzJMwx1VAN3 B7nwTFxho5tj1Nf7oMr5fviEjmHMO48AGz++T0VPyAWvwMN88W0LBh7zXVqpYs/XeG9MNc 9ev1w442ZyqTv4cyK8NHym2okAngxjFNf+swFRoLc5ALZOOqQ1FQL5RXcX0kGw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/3] update.sh: Remove code to add providers into n2n configs Date: Wed, 7 Jun 2023 16:21:50 +0200 Message-Id: <20230607142150.18407-3-adolf.belka@ipfire.org> In-Reply-To: <20230607142150.18407-1-adolf.belka@ipfire.org> References: <20230607142150.18407-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - This code is no longer required with the code changes in the ovpnmain.cgi patch in this patch set. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/core/175/update.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh index 82676bc72..5e45c819f 100644 --- a/config/rootfiles/core/175/update.sh +++ b/config/rootfiles/core/175/update.sh @@ -177,20 +177,6 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi -## 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/ovpnconfig); 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