From 670e3a0c6af263169d0d9da47458e3e89f121281 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Wed, 22 Nov 2017 09:52:53 -0800 Subject: [PATCH] IPv6 Samples use logical interface names Signed-off-by: Tom Eastep --- Shorewall6/Samples6/one-interface/interfaces | 6 +++--- Shorewall6/Samples6/three-interfaces/interfaces | 10 +++++----- Shorewall6/Samples6/three-interfaces/stoppedrules | 13 ++++++------- Shorewall6/Samples6/two-interfaces/interfaces | 8 ++++---- Shorewall6/Samples6/two-interfaces/stoppedrules | 8 ++++---- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Shorewall6/Samples6/one-interface/interfaces b/Shorewall6/Samples6/one-interface/interfaces index 312c1acd2..5fc6966e7 100644 --- a/Shorewall6/Samples6/one-interface/interfaces +++ b/Shorewall6/Samples6/one-interface/interfaces @@ -1,6 +1,6 @@ # -# Shorewall6 version 5 - Sample Interfaces File for one-interface configuration. -# Copyright (C) 2006-2015 by the Shorewall Team +# Shorewall6 - Sample Interfaces File for one-interface configuration. +# Copyright (C) 2006-2017 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,4 +14,4 @@ ?FORMAT 2 ############################################################################### #ZONE INTERFACE OPTIONS -net eth0 tcpflags +net NET_IF tcpflags,physical=eth0 diff --git a/Shorewall6/Samples6/three-interfaces/interfaces b/Shorewall6/Samples6/three-interfaces/interfaces index cefa08fa7..e3bef5c42 100644 --- a/Shorewall6/Samples6/three-interfaces/interfaces +++ b/Shorewall6/Samples6/three-interfaces/interfaces @@ -1,6 +1,6 @@ # -# Shorewall6 version 4 - Sample Interfaces File for three-interface configuration. -# Copyright (C) 2006-2014by the Shorewall Team +# Shorewall6 - Sample Interfaces File for three-interface configuration. +# Copyright (C) 2006-2017 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,6 +14,6 @@ ?FORMAT 2 ############################################################################### #ZONE INTERFACE OPTIONS -net eth0 tcpflags,forward=1,sourceroute=0 -loc eth1 tcpflags,forward=1 -dmz eth2 tcpflags,forward=1 +net NET_IF tcpflags,forward=1,sourceroute=0,physical=eth0 +loc LOC_IF tcpflags,forward=1,physical=eth1 +dmz DMZ_IF tcpflags,forward=1,physical=eth2 diff --git a/Shorewall6/Samples6/three-interfaces/stoppedrules b/Shorewall6/Samples6/three-interfaces/stoppedrules index dd5b3c6a5..c891acd9a 100644 --- a/Shorewall6/Samples6/three-interfaces/stoppedrules +++ b/Shorewall6/Samples6/three-interfaces/stoppedrules @@ -1,6 +1,6 @@ # -# Shorewall6 version 4.5 Sample Stoppedrules File for three-interface configuration. -# Copyright (C) 2012-2014 by the Shorewall Team +# Shorewall6 - Sample Stoppedrules File for three-interface configuration. +# Copyright (C) 2012-2017 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -13,8 +13,7 @@ ############################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE # PORT(S) PORT(S) -ACCEPT eth1 - -ACCEPT - eth1 -ACCEPT eth2 - -ACCEPT - eth2 - +ACCEPT LOC_IF - +ACCEPT - LOC_IF +ACCEPT DMZ_IF - +ACCEPT - DMZ_IF diff --git a/Shorewall6/Samples6/two-interfaces/interfaces b/Shorewall6/Samples6/two-interfaces/interfaces index 2cd21adc5..4b6321322 100644 --- a/Shorewall6/Samples6/two-interfaces/interfaces +++ b/Shorewall6/Samples6/two-interfaces/interfaces @@ -1,6 +1,6 @@ # -# Shorewall6 version 4.0 - Sample Interfaces File for two-interface configuration. -# Copyright (C) 2006-2014 by the Shorewall Team +# Shorewall6 - Sample Interfaces File for two-interface configuration. +# Copyright (C) 2006-2017 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,5 +14,5 @@ ?FORMAT 2 ############################################################################### #ZONE INTERFACE OPTIONS -net eth0 tcpflags,forward=1,sourceroute=0 -loc eth1 tcpflags,forward=1 +net NET_IF tcpflags,forward=1,sourceroute=0,physical=eth0 +loc LOC_IF tcpflags,forward=1,physical=eth1 diff --git a/Shorewall6/Samples6/two-interfaces/stoppedrules b/Shorewall6/Samples6/two-interfaces/stoppedrules index 5873bc1ae..2f4596615 100644 --- a/Shorewall6/Samples6/two-interfaces/stoppedrules +++ b/Shorewall6/Samples6/two-interfaces/stoppedrules @@ -1,6 +1,6 @@ # -# Shorewall6 version 4.5 Sample Stoppedrules File for two-interface configuration. -# Copyright (C) 2012-2014 by the Shorewall Team +# Shorewall6 - Sample Stoppedrules File for two-interface configuration. +# Copyright (C) 2012-2017 by the Shorewall Team # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -13,5 +13,5 @@ ############################################################################### #ACTION SOURCE DEST PROTO DEST SOURCE # PORT(S) PORT(S) -ACCEPT eth1 - -ACCEPT - eth1 +ACCEPT LOC_IF - +ACCEPT - LOC_IF