[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbaf9bdf21bff1a48eef82e6807a28d1e939783d

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2635 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  bbaf9bdf21bff1a48eef82e6807a28d1e939783d (commit)
       via  d047b493aaae6cb98e589718b778a67b0566f4e4 (commit)
      from  d0cbdd63632a23cca03035f2840be0c424933000 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bbaf9bdf21bff1a48eef82e6807a28d1e939783d
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Jul 11 12:11:02 2020 +0200

    convert-to-location: Regenerate firewall chains.
    
    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 <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit d047b493aaae6cb98e589718b778a67b0566f4e4
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sat Jul 11 12:11:01 2020 +0200

    convert-to-location: Fix double patch declaration
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 src/scripts/convert-to-location | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/src/scripts/convert-to-location b/src/scripts/convert-to-location
index 2d830078a..9149b854d 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.
@@ -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.


hooks/post-receive
--
IPFire 2.x development tree