public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/3] update.sh: Remove code to add providers into n2n configs
Date: Wed, 07 Jun 2023 16:21:50 +0200	[thread overview]
Message-ID: <20230607142150.18407-3-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20230607142150.18407-1-adolf.belka@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]

- This code is no longer required with the code changes in the ovpnmain.cgi patch in this
   patch set.

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 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
 
-- 
2.40.1


  parent reply	other threads:[~2023-06-07 14:21 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07 14:21 [PATCH 1/3] ovpnmain.cgi: Updated fix for Bug#13137 Adolf Belka
2023-06-07 14:21 ` [PATCH 2/3] backup.pl: Remove the previous code for adding legacty provider to n2n Adolf Belka
2023-06-10 10:16   ` Michael Tremer
2023-06-10 11:16     ` Adolf Belka
2023-06-10 11:28       ` Michael Tremer
2023-06-11 13:17         ` Adolf Belka
2023-06-11 16:29           ` Michael Tremer
2023-06-07 14:21 ` Adolf Belka [this message]
2023-06-10 10:15 ` [PATCH 1/3] ovpnmain.cgi: Updated fix for Bug#13137 Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230607142150.18407-3-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox