[debian-lan-devel] [debian-lan] 02/04: Fix shorewall setup.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 76ea37080303a3ef8e9eb06a5392085f9e401c3a
Author: Andreas B. Mundt <andi at debian.org>
Date:   Mon Jan 23 10:38:56 2017 +0100

    Fix shorewall setup.
    
    The file 'masq' has been renamed to 'snat'.
---
 fai/config/scripts/FIREWALL/10-config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fai/config/scripts/FIREWALL/10-config b/fai/config/scripts/FIREWALL/10-config
index e7e764e..35fef0b 100755
--- a/fai/config/scripts/FIREWALL/10-config
+++ b/fai/config/scripts/FIREWALL/10-config
@@ -11,7 +11,7 @@ CONFDIR="${target}/etc/shorewall/"
 
 prepare_shorewall(){
     ## Use shorewall's "two-interfaces" example as base setup:
-    for FILE in interfaces masq policy stoppedrules rules zones ; do
+    for FILE in interfaces snat policy stoppedrules rules zones ; do
         cp -v ${target}/usr/share/doc/shorewall/examples/two-interfaces/$FILE $CONFDIR
     done
 
@@ -19,7 +19,7 @@ prepare_shorewall(){
     sed -i "s/IP_FORWARDING=Keep/IP_FORWARDING=on/" $CONFDIR/shorewall.conf
 
     ## Define interfaces and use parameters:
-    sed -i -e 's/eth0/\$NET_IF/' -e 's/eth1/\$LOC_IF/' $CONFDIR/interfaces $CONFDIR/masq $CONFDIR/stoppedrules
+    sed -i -e 's/eth0/\$NET_IF/' -e 's/eth1/\$LOC_IF/' $CONFDIR/interfaces $CONFDIR/snat $CONFDIR/stoppedrules
     sed -i -e "\$i LOC_IF=${NIC_LABEL0}" -e "\$i NET_IF=${NIC_LABEL1}" $CONFDIR/params
 
     ## Limited ssh access (uncomment to activate):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git