From patchwork Wed Jan 10 14:38:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7442 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) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9lVr1V84z3wdf for ; Thu, 11 Jan 2024 13:14:12 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9lVk2b9wz1k6; Thu, 11 Jan 2024 13:14:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9lVk1wxJz2xcr; Thu, 11 Jan 2024 13:14:06 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T99R05c1Wz32h5 for ; Wed, 10 Jan 2024 14:38:52 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T99Qy2zb8z2P1; Wed, 10 Jan 2024 14:38:50 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704897530; 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=hSff+H6gwKLqN8/VnNTAjoirovxKyxUYlKEOSHO2OyU=; b=14KP8VsgUky71ug/vSJxNmTg3yxOjkc9VKqEf0gHP1lyFX/q2gKRgMKTysaOJNFOcYehMJ 8JZ1hzPva+jSq9AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704897530; 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=hSff+H6gwKLqN8/VnNTAjoirovxKyxUYlKEOSHO2OyU=; b=HSYnheHEu+iUDCDrB+XrByNCnMocmXoq1mIIvkUIHQMZGD+j8EzCY51DktrH5eLvsbMBSs nKBJ00a/TRRqU++PRgY/06b46G/UDbKkm1emwA/J0/s7icUU9ps7fHj60TM/trZAuKiCKB KyOZIH8rq9g7+LNk8f6FdA8LHrZwkas4EjE0Qm3F+ODKU0DdIwDn4VBKq7NK8iQGVOvgg7 XVj73lnfbPit1GOgOGrSPl/SnEfMXoHXUrflz+aWJP5c+2pRrIPXMkOosDIA0e7OqxjrWi fUAelSOW7fTGq8c9JdrepjzXOI3t0RiX0Wn8i9A7DMKi43xQLDhq8DrFkZiSFw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 4/4] optionsfw.cgi: Move Logging section to after all Firewall Options Drop commands Date: Wed, 10 Jan 2024 15:38:45 +0100 Message-ID: <20240110143845.12957-4-adolf.belka@ipfire.org> In-Reply-To: <20240110143845.12957-1-adolf.belka@ipfire.org> References: <20240110143845.12957-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: GWWYRP43PQ5KYNV5KND3MQ737YZS3U7P X-Message-ID-Hash: GWWYRP43PQ5KYNV5KND3MQ737YZS3U7P X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Moved the Logging section to after all Firewall Options Drop commands as discussed at January 2024 Video Call. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/optionsfw.cgi | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index a2a0058f7..6f80f1901 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -218,6 +218,29 @@ END
+ + + + + + + + +
$Lang::tr{'fw red'}
$Lang::tr{'drop hostile'} + $Lang::tr{'on'} / + $Lang::tr{'off'} +
+
+ + + + + +
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}$Lang::tr{'on'} / + $Lang::tr{'off'}
$Lang::tr{'drop samba'}$Lang::tr{'on'} / + $Lang::tr{'off'}
+
+ @@ -295,28 +318,6 @@ END
$Lang::tr{'fw logging'}

- - - - - - - - -
$Lang::tr{'fw red'}
$Lang::tr{'drop hostile'} - $Lang::tr{'on'} / - $Lang::tr{'off'} -
-
- - - - - -
$Lang::tr{'fw blue'}
$Lang::tr{'drop proxy'}$Lang::tr{'on'} / - $Lang::tr{'off'}
$Lang::tr{'drop samba'}$Lang::tr{'on'} / - $Lang::tr{'off'}
-
$Lang::tr{'fw settings'}
$Lang::tr{'fw settings color'}$Lang::tr{'on'} /