From patchwork Tue Jul 1 13:44:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8864 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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4bWkmC1V9Fz3wmb for ; Tue, 1 Jul 2025 13:44:43 +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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bWkmB45Vjz6Lj for ; Tue, 1 Jul 2025 13:44:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bWkmB3PB8z2ykg for ; Tue, 1 Jul 2025 13:44:42 +0000 (UTC) X-Original-To: development@lists.ipfire.org 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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bWkm73X8Rz2xWZ for ; Tue, 1 Jul 2025 13:44:39 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4bWkm60Xstz1rb; Tue, 1 Jul 2025 13:44:38 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1751377478; 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; bh=XynZEmf0jKdhuUKcjRxmGOMVeCZkyh6f5NjRQl7/ToI=; b=5C06lubpzVpy4vC8H6xTW0h2JdI6q/+G0d68RYhObL6J8d0pwnX105ZtVi3nQT4Th67Dh7 goUZcjv7UaGtQqAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1751377478; 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; bh=XynZEmf0jKdhuUKcjRxmGOMVeCZkyh6f5NjRQl7/ToI=; b=Z4Vi5jFz8dsXs6YdP9XzRFIQQmWiNS0tGmrYyKevbMtQmflS5bfxjkO7C0TABcar1ChBPX 3SRWgNfswO9uXj5nkyyy/MoZLXHE+DScmIGcnOqCp9EQsaJHIYzZxNWYM+B632rBRi7LsK 4Upg1RZeAdJC4h7I2HdM1kMVZ9hq63egW6dhCJVj2jc7OuCFy6GG4t5pFc5oRyFdec0oKV 1wsGFEFk4pSXIqZCVH3YeFNtr+wEGiQiqW0UoZ8kP5EGcxrViOUjMYi1+Das5qzecseqAm ZFyiabEAsVnmZxesRGtcbwjrT48JIWmtkrfE4v/2NArcAAQX++LmkvpstUIDhQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] core196: Revert ship of customservices from fwhosts Date: Tue, 1 Jul 2025 15:44:35 +0200 Message-ID: <20250701134435.10975-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - Shipping the customservices file replaced the existing file on all users systems, which resulted in any modificationjs they had made being wiped out. - Having thought about it further what I shouldn have done is just added the additional custom service of "DNS over TLS" to the end of the customservices file during the update process using update.sh but that is also not so easy because what number to use for the "DNS over TLS" entry will depend on how many custom services the user has created. - At the least the shipping of the customservices file needs to be reverted. I and others can then think about alternative ways to provide that entry to existing files. - Alternatively we could leave it without doing anything. A fresh install will have the "DNS over TLS" entry and upgrades will just leave the existing customservices file alone. - Users can of course recover the file by doing a restore from the backup they have created but it is not good to overwrite those sorts of files. Signed-off-by: Adolf Belka --- config/rootfiles/core/196/filelists/files | 1 - 1 file changed, 1 deletion(-) diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/core/196/filelists/files index 1d83bafb5..8e1fc096d 100644 --- a/config/rootfiles/core/196/filelists/files +++ b/config/rootfiles/core/196/filelists/files @@ -11,7 +11,6 @@ srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/wireguard.cgi usr/sbin/setup var/ipfire/backup/bin/backup.pl -var/ipfire/fwhosts/customservices var/ipfire/graphs.pl var/ipfire/header.pl var/ipfire/ipblocklist-functions.pl