From patchwork Thu Jun 4 14:32:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3155 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49d7Xh6wzdz43xT for ; Thu, 4 Jun 2020 14:32:36 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49d7XY6J2Jz1VR; Thu, 4 Jun 2020 14:32:29 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49d7XY3GGpz2yZy; Thu, 4 Jun 2020 14:32:29 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49d7XX3t7Lz2xGF for ; Thu, 4 Jun 2020 14:32:28 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 49d7XW4Xy8z1VR; Thu, 4 Jun 2020 14:32:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1591281147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wt6cc/pwfrEgblJw7Uwd6SH9sPPoE2yU18CFfFyz1iM=; b=Ov0vRHLIVzoJG3nRfzCQ8QfNCDL9q2lrjyoMJMUFJNUorEGhlTe2ALGOB5nOCYPcJN4zgT azde4kBh/3Q5NgAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1591281147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wt6cc/pwfrEgblJw7Uwd6SH9sPPoE2yU18CFfFyz1iM=; b=h352aMzsu+RHYxn5re+EWfDkqXSeUakEGvvtW0B+U2vsGmr3vM+ma0yQABHxk1OroABCtD 3fFFNk9wcyfUUkp+jBC3DTmz1IXOmmvvHjb1qhY4wD1OqfqVnnQ+/B8Dlo33fm1aLQrcOJ x3m89hJlzV8KBvAt66utxxfGzVh9+NFHU5dtnjinbXJl1svi+3C3tQLxJ1rPMAYphkzNLI gnuQA/0CeNN0TvTRdkOSr3d1PYWq6dyifcHr9dWOF8t1OfnEG6gGiYoKgjEhFquPe+gqf5 RWr4JZ2yZULMnCPvwKfIS8W4qYgwGh6cWMu29hJUvOVJ5p3OGh+lVqdySxKSrQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] core145: Remove double-added configuration lines for OpenVPN Date: Thu, 4 Jun 2020 14:32:22 +0000 Message-Id: <20200604143222.3380-1-michael.tremer@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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- config/rootfiles/core/145/update.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/145/update.sh b/config/rootfiles/core/145/update.sh index 38653b730..4b59a03dc 100644 --- a/config/rootfiles/core/145/update.sh +++ b/config/rootfiles/core/145/update.sh @@ -78,7 +78,10 @@ for package in perl-DBI perl-DBD-SQLite; do done # Enable OpenVPN metrics collection -grep -q "^client-connect" /var/ipfire/ovpn/server.conf || cat <> /var/ipfire/ovpn/server.conf +sed -E -i /var/ipfire/ovpn/server.conf \ + -e "/^client-(dis)?connect/d" + +cat <> /var/ipfire/ovpn/server.conf # Log clients connecting/disconnecting client-connect "/usr/sbin/openvpn-metrics client-connect" client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"