From patchwork Sat Jul 11 10:11:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 3255 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 4B3m033s1Tz3xKH for ; Sat, 11 Jul 2020 10:11:15 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4B3m015mxTz28k; Sat, 11 Jul 2020 10:11:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4B3m012Bxfz2yw5; Sat, 11 Jul 2020 10:11:13 +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 4B3lzz74YBz2yNP for ; Sat, 11 Jul 2020 10:11:11 +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 4B3lzy4d4kzcT; Sat, 11 Jul 2020 10:11:10 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1594462271; 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=fFKGbL7NiRbShKBVe5RCpo8iSnbs0sJN9Odzcs7Sbqg=; b=EqxlrsavxKH7BAkybASn77ZlBIz4GfdxmX2DCnGNWhzJEM2WvNP2ZfENIaCs4iTgxcWsFw jOSflQ+tpS3qNNAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1594462271; 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=fFKGbL7NiRbShKBVe5RCpo8iSnbs0sJN9Odzcs7Sbqg=; b=j5hz59+Li7bzItytYjkMFia4Yjn/j+4BBM+Kt5l8dDJo8ojS4uLQbFWAi3aqA0FINsOzlY 5d04ASOlQ4Koh6B/Y9OsT/UvgL3bLqHNdx/Go1GDA60HYRYH619oghrx6hiwkjLL07sYZp KtzSl94vID3FcRs0as+zc4sD8rxIwrIVz/hpp6l0VaHq2D0K8hNs0cPXGlJ7D6wYip6dkD lQrEuAXbYPtOCwutpytc4hrWO8f7hD2gLvgW3sQNceBPfGA/JsrakTOrzSJal2OIFcj8XO zcHvVUu2+pc3xZ//Q6SfbY45LY18QSidMyETWNS/K1QVYeCaRxSv7qaue6AvWQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] convert-to-location: Fix double patch declaration Date: Sat, 11 Jul 2020 12:11:01 +0200 Message-Id: <20200711101102.2528-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- src/scripts/convert-to-location | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location index 2d830078a..db61d3c79 100755 --- a/src/scripts/convert-to-location +++ b/src/scripts/convert-to-location @@ -36,7 +36,7 @@ if [ -f "$FW_CONF_DIR/geoipblock" ]; then for file in "$FW_CONF_DIR/config" "$FW_CONF_DIR/input" "$FW_CONF_DIR/outgoing"; do # Convert pattern which indicates location based rules to the new # ones. - sed -i 's/cust_geoip/cust_location/g' "$FW_CONF_DIR/$file" + sed -i 's/cust_geoip/cust_location/g' "$file" done # Rename indicator for location based groups to the new one. From patchwork Sat Jul 11 10:11:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 3256 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4B3m044txFz3xTR for ; Sat, 11 Jul 2020 10:11:16 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4B3m040WqGz1Lh; Sat, 11 Jul 2020 10:11:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4B3m035ZZJz2yvl; Sat, 11 Jul 2020 10:11:15 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4B3m005Hywz2ybR for ; Sat, 11 Jul 2020 10:11:12 +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 4B3m001z0Kz1Lh; Sat, 11 Jul 2020 10:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1594462272; 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=lMs0dNFsoUqlRTBmlzC5c6ckOucQmvUPb+wrBL/se18=; b=RiRuM7qgS1NHgKf5zPH/1lqounQoHQ9Nh/OuwkcLu0yc0wzIBtovinAq6vBmd3HQNLDaDQ 0ciqY8k+VAuAw8U+z/FYrLFI58cYHuXZiPey6m3sUwakeefhM/Jz9t3/McQl7IhfEDrJKK IqZvbHS1ZMo0UY9eGk+CmpYqsKRzVElSNMSk7aVpvTMaSqvAmZsaXNBR153iThEVD5KdtH /Iuk6ibi+SF/HU8TJnhl2Utq5CntoS1Xk4wmeKfh1XrFpiQiR9qIMN9RqLZE8s3PzFeUK9 cI3QldAj7OU2apQvF+1NHaQXr0Hfr6p0oZUOWwWYdoC47a8VYNp8eNSI1KnTqw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1594462272; 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=lMs0dNFsoUqlRTBmlzC5c6ckOucQmvUPb+wrBL/se18=; b=D596tKDalNX2QHWYTNgQ97Xiu9dEK/31qW1g9epyGSJbgpbORl6KC5u+CSRbT78lAqC2Ey pvVnQaqMo1oZfyDg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/2] convert-to-location: Regenerate firewall chains. Date: Sat, 11 Jul 2020 12:11:02 +0200 Message-Id: <20200711101102.2528-2-stefan.schantl@ipfire.org> In-Reply-To: <20200711101102.2528-1-stefan.schantl@ipfire.org> References: <20200711101102.2528-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@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: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" The firewall chain for location based rules has been renamed to LOCATIONBLOCK and therefore the fiewall needs to be restarted and the chains regenerated. Signed-off-by: Stefan Schantl --- src/scripts/convert-to-location | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location index db61d3c79..9149b854d 100755 --- a/src/scripts/convert-to-location +++ b/src/scripts/convert-to-location @@ -44,6 +44,9 @@ if [ -f "$FW_CONF_DIR/geoipblock" ]; then # Rename file to the new name. mv "$HOSTS_CONF_DIR/customgeoipgrp" "$HOSTS_CONF_DIR/customlocationgrp" + + # Regenerate firewall chains. + /etc/init.d/firewall restart fi # Finished.