diff options
| author | Matt Taggart <taggart@riseup.net> | 2017-01-31 10:45:00 -0800 |
|---|---|---|
| committer | Matt Taggart <taggart@riseup.net> | 2017-01-31 10:45:00 -0800 |
| commit | ff6c12482b812cdc262dabcd1faebc63e466087f (patch) | |
| tree | b82b60b4390763c7d805a37e40b67319641671c3 /files/boilerplate | |
| parent | 77ce0b926b7418703223b4a6c489067f9d9bc4f5 (diff) | |
| parent | f560a426885f0982cae39495321222158a69e895 (diff) | |
Merge remote-tracking branch 'shared/master' into merge
Conflicts:
manifests/base.pp
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 |