diff options
author | Micah <micah@riseup.net> | 2015-12-09 14:41:31 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-12-09 14:41:31 +0000 |
commit | edd5db0159d5075609c545fb3ee10727a1cf5271 (patch) | |
tree | d6a923dd8aaeed28210272c1895d9f23d8b250d3 /files/boilerplate | |
parent | 1cfb479d642bc106ea71596a49b3c152dcb2f64f (diff) | |
parent | 6bca4007a104cc7f1736613679b171f19a706685 (diff) | |
download | puppet-shorewall-edd5db0159d5075609c545fb3ee10727a1cf5271.tar.gz puppet-shorewall-edd5db0159d5075609c545fb3ee10727a1cf5271.tar.bz2 |
Merge branch 'immerda_changes' into 'master'
shared
Immerda changes
See merge request !5
Diffstat (limited to 'files/boilerplate')
-rw-r--r-- | files/boilerplate/interfaces.header | 4 | ||||
-rw-r--r-- | files/boilerplate/policy.header | 8 | ||||
-rw-r--r-- | files/boilerplate/zones.header | 11 |
3 files changed, 13 insertions, 10 deletions
diff --git a/files/boilerplate/interfaces.header b/files/boilerplate/interfaces.header index 2027523..663e436 100644 --- a/files/boilerplate/interfaces.header +++ b/files/boilerplate/interfaces.header @@ -1,10 +1,10 @@ # -# Shorewall version 3.4 - Interfaces File +# Shorewall version 4 - Interfaces File # # For information about entries in this file, type "man shorewall-interfaces" # # For additional information, see -# http://shorewall.net/Documentation.htm#Interfaces +# http://www.shorewall.net/manpages/shorewall-interfaces.html # ############################################################################### #ZONE INTERFACE BROADCAST OPTIONS diff --git a/files/boilerplate/policy.header b/files/boilerplate/policy.header index a0c5d5d..cc9781f 100644 --- a/files/boilerplate/policy.header +++ b/files/boilerplate/policy.header @@ -1,9 +1,11 @@ # -# Shorewall version 3.4 - Policy File +# Shorewall version 4 - Policy File # # For information about entries in this file, type "man shorewall-policy" # -# See http://shorewall.net/Documentation.htm#Policy for additional information. +# The manpage is also online at +# http://www.shorewall.net/manpages/shorewall-policy.html # ############################################################################### -#SOURCE DEST POLICY LOG LIMIT:BURST +#SOURCE DEST POLICY LOG LIMIT: CONNLIMIT: +# LEVEL BURST MASK diff --git a/files/boilerplate/zones.header b/files/boilerplate/zones.header index 8b82c2e..5dada52 100644 --- a/files/boilerplate/zones.header +++ b/files/boilerplate/zones.header @@ -1,11 +1,12 @@ # -# Shorewall version 3.4 - Zones File +# Shorewall version 4 - Zones File # # For information about this file, type "man shorewall-zones" # -# For more information, see http://www.shorewall.net/Documentation.htm#Zones +# The manpage is also online at +# http://www.shorewall.net/manpages/shorewall-zones.html # ############################################################################### -#ZONE TYPE OPTIONS IN OUT -# OPTIONS OPTIONS -fw firewall +#ZONE TYPE OPTIONS IN OUT +# OPTIONS OPTIONS +fw firewall |