summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorduritong <peter.meier+github@immerda.ch>2017-01-12 15:47:48 +0100
committerGitHub <noreply@github.com>2017-01-12 15:47:48 +0100
commit07f4d8f14ac5224ba900d27f51cd4ae8121f1578 (patch)
tree8b66aeaf3df3be46ca603fc081d8293bc2114a35 /manifests/init.pp
parent78b2f91caf4c7ade2630376c9c326773fdd5ef3c (diff)
parent24076ddaa5c802b503e59e279750ab5d6353815d (diff)
Merge branch 'master' into master
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp17
1 files changed, 12 insertions, 5 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 6ee8c5d..aac1520 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,11 @@
# Manage shorewall on your system
class shorewall(
- $startup = '1',
+ $startup = true,
$conf_source = false,
+ $settings = {
+ 'LOG_MARTIANS' => 'No',
+ 'DISABLE_IPV6' => 'Yes',
+ },
$ensure_version = 'present',
$tor_transparent_proxy_host = '127.0.0.1',
$tor_transparent_proxy_port = '9040',
@@ -45,15 +49,16 @@ class shorewall(
$tunnels_defaults = {},
$rtrules = {},
$rtrules_defaults = {},
+ $daily_check = true,
) {
case $::operatingsystem {
- gentoo: { include shorewall::gentoo }
- debian,ubuntu: { include shorewall::debian }
- centos: { include shorewall::centos }
+ 'Gentoo': { include ::shorewall::gentoo }
+ 'Debian','Ubuntu': { include ::shorewall::debian }
+ 'CentOS': { include ::shorewall::centos }
default: {
notice "unknown operatingsystem: ${::operatingsystem}"
- include shorewall::base
+ include ::shorewall::base
}
}
@@ -97,6 +102,8 @@ class shorewall(
'rtrules',
# See http://shorewall.net/manpages/shorewall-conntrack.html
'conntrack',
+ # See http://www.shorewall.net/manpages/shorewall-mangle.html
+ 'mangle',
]:;
}