summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2017-04-08 13:21:14 +0200
committermh <mh@immerda.ch>2017-04-08 13:21:14 +0200
commit6ac2e1752f2185c293360aa062b7f49facff6abe (patch)
tree6c50c95aab04e690bca22159fdddc374a5e8ffa3 /manifests
parenta8c1abea710e88e63a64b8889fe9965e95ff1740 (diff)
manage interfaces for shorewall6
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/interface.pp13
2 files changed, 13 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index eeab56f..f74466b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -124,7 +124,7 @@ class shorewall(
'mangle',
]:;
}
- Shorewall::Managed_file['zones']{
+ Shorewall::Managed_file['zones','interfaces']{
shorewall6 => true,
}
diff --git a/manifests/interface.pp b/manifests/interface.pp
index 4ec587e..3a90046 100644
--- a/manifests/interface.pp
+++ b/manifests/interface.pp
@@ -40,7 +40,18 @@ define shorewall::interface(
}
shorewall::entry { "interfaces-${order}-${name}":
- line => "${zone} ${name} ${broadcast} ${all_options2}",
+ line => "${zone} ${name} ${broadcast} ${all_options2}",
+ shorewall => true,
+ shorewall6 => false,
+ }
+ if $shorewall::with_shorewall6 {
+ # logmartians is not available on shorewall6
+ $all_options3 = regsubst($all_options2,',logmartians','')
+ shorewall::entry { "interfaces-${order}-${name}_6":
+ line => "${zone} ${name} ${broadcast} ${all_options3}",
+ shorewall => false,
+ shorewall6 => true,
+ }
}
}