diff options
| author | Lebedev Vadim <abraham1901@gmail.com> | 2016-04-29 13:05:55 +0300 |
|---|---|---|
| committer | Lebedev Vadim <abraham1901@gmail.com> | 2016-04-29 13:05:55 +0300 |
| commit | ef445bc9b9482f5e6efa7f18fdc79efc60fccb5c (patch) | |
| tree | 8cb787458aab582df8372ce4579de6d9d19a5699 /files | |
| parent | 79503b830d17af99427c69eb64c2e21a7c36485f (diff) | |
| parent | eaba8159fcfc38dbc72e2476e753b05ea7554d55 (diff) | |
Merge branch 'master' of https://github.com/duritong/puppet-shorewall
Conflicts:
manifests/debian.pp
manifests/managed_file.pp
Diffstat (limited to 'files')
| -rw-r--r-- | files/boilerplate/interfaces.header | 4 | ||||
| -rw-r--r-- | files/boilerplate/policy.header | 8 | ||||
| -rw-r--r-- | files/boilerplate/tunnels.footer (renamed from files/boilerplate/tunnel.footer) | 0 | ||||
| -rw-r--r-- | files/boilerplate/tunnels.header (renamed from files/boilerplate/tunnel.header) | 0 | ||||
| -rw-r--r-- | files/boilerplate/zones.header | 11 |
5 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/tunnel.footer b/files/boilerplate/tunnels.footer index 5e12d1d..5e12d1d 100644 --- a/files/boilerplate/tunnel.footer +++ b/files/boilerplate/tunnels.footer diff --git a/files/boilerplate/tunnel.header b/files/boilerplate/tunnels.header index 638fd56..638fd56 100644 --- a/files/boilerplate/tunnel.header +++ b/files/boilerplate/tunnels.header 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 |