From patchwork Mon Feb 28 20:32:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5291 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K6sWj3DJLz3wtR for ; Mon, 28 Feb 2022 20:32:49 +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 4K6sWh1g5Gz2Kw; Mon, 28 Feb 2022 20:32:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K6sWh0fZXz2ydY; Mon, 28 Feb 2022 20:32:48 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K6sWf1tXZz2xy1 for ; Mon, 28 Feb 2022 20:32:46 +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 4K6sWc2fkPz18h; Mon, 28 Feb 2022 20:32:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1646080365; 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: in-reply-to:in-reply-to:references:references; bh=ib9VRrhv6nrpG/dA4F+N2fh+ob5pxio76vf1ZhULUKU=; b=xcYeT+fO/M86ICM7ylFh7ewiDQioxgTBTHMFnE91JERvRO8rH1pgNm6W7Ycni8c4+S9IS2 wpMDYhmhURNqwaAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1646080365; 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: in-reply-to:in-reply-to:references:references; bh=ib9VRrhv6nrpG/dA4F+N2fh+ob5pxio76vf1ZhULUKU=; b=KX+e0UsClpbuKiYMBY4IopzPr8GrB8n/77s6Yy9Ho2xKd6wlD4LkBjPuucFZwn0LQSbdRH eohNSFVmdL+83mQ74tSgC6jdMBe4z7exqqdBo+igKJmZ95tNAyTsRaUDtocGPqpGcz9bZB eKo/Ja1Jd7pexnHfndDOJZKQQYK5JzvYxkqHOsx6jqqBFOyps5q147ceZXdUfj7Sc4vEcL R+cxIo8qkK54b+x7EtrGq167YJwvsdbnGYzwx2WGZBpO9R2yR37ycpp0TrqRF34yfe4tKH QU61TDWnEJY9ToYCqr3TPZ4sRDpY8Cg/vmLn2MSfQn1jmsk5bX3zcXRQrOip7w== Message-ID: <451ff4eb-49ae-79ef-aaf0-71e086b7c9b9@ipfire.org> Date: Mon, 28 Feb 2022 20:32:40 +0000 MIME-Version: 1.0 Subject: [PATCH] Core Update 165: Rename squid-accounting add-on to proxy-accounting Content-Language: en-US To: Michael Tremer , Adolf Belka References: <20220218143239.5883-1-adolf.belka@ipfire.org> <874c5d08-a946-e465-1e3d-8ca64e9aca9c@ipfire.org> <11C1C0AC-AD26-404D-8C1F-7E233C7507DF@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <11C1C0AC-AD26-404D-8C1F-7E233C7507DF@ipfire.org> 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: development@lists.ipfire.org Errors-To: development-bounces@lists.ipfire.org Sender: "Development" https://lists.ipfire.org/pipermail/development/2022-February/012482.html Cc: Michael Tremer Cc: Adolf Belka Signed-off-by: Peter Müller --- config/rootfiles/core/165/update.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh index fe4449fff..c0939bce6 100644 --- a/config/rootfiles/core/165/update.sh +++ b/config/rootfiles/core/165/update.sh @@ -97,6 +97,18 @@ rm -rvf \ /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \ /var/ipfire/firewall/p2protocols +# Rename squid-accounting add-on to proxy-accounting, if installed +# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html) +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then + stop_service squid-accounting + + mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting + mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting + mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting + + start_service proxy-accounting +fi + # Stop services # Extract files