aboutsummaryrefslogtreecommitdiff
path: root/manifests/rules
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2013-02-09 16:43:50 +0100
committerintrigeri <intrigeri@boum.org>2013-02-09 16:43:50 +0100
commitddb4e09e4c6124b321c7b8abb50f45efa062b22c (patch)
treee12e481dc2cba405338fc256520182812ae9c6c3 /manifests/rules
parent27a5b24f613abac86e56d576393de19af3cc577e (diff)
downloadpuppet-shorewall-ddb4e09e4c6124b321c7b8abb50f45efa062b22c.tar.gz
puppet-shorewall-ddb4e09e4c6124b321c7b8abb50f45efa062b22c.tar.bz2
Linting.
Diffstat (limited to 'manifests/rules')
-rw-r--r--manifests/rules/libvirt/host.pp30
1 files changed, 21 insertions, 9 deletions
diff --git a/manifests/rules/libvirt/host.pp b/manifests/rules/libvirt/host.pp
index fe7820c..dfb753c 100644
--- a/manifests/rules/libvirt/host.pp
+++ b/manifests/rules/libvirt/host.pp
@@ -5,10 +5,17 @@ class shorewall::rules::libvirt::host (
) {
define shorewall::rule::accept::from_vmz (
- $proto = '-', $destinationport = '-', $action = 'ACCEPT' ) {
- shorewall::rule { "$name":
- source => $vmz, destination => '$FW', order => 300,
- proto => $proto, destinationport => $destinationport, action => $action;
+ $proto = '-',
+ $destinationport = '-',
+ $action = 'ACCEPT'
+ ) {
+ shorewall::rule { $name:
+ source => $shorewall::rules::libvirt::host::vmz,
+ destination => '$FW',
+ order => 300,
+ proto => $proto,
+ destinationport => $destinationport,
+ action => $action;
}
}
@@ -32,9 +39,14 @@ class shorewall::rules::libvirt::host (
}
shorewall::rule::accept::from_vmz {
- 'accept_dns_from_vmz': action => 'DNS(ACCEPT)';
- 'accept_tftp_from_vmz': action => 'TFTP(ACCEPT)';
- 'accept_puppet_from_vmz': proto => 'tcp', destinationport => '8140', action => 'ACCEPT';
+ 'accept_dns_from_vmz':
+ action => 'DNS(ACCEPT)';
+ 'accept_tftp_from_vmz':
+ action => 'TFTP(ACCEPT)';
+ 'accept_puppet_from_vmz':
+ proto => 'tcp',
+ destinationport => '8140',
+ action => 'ACCEPT';
}
if $debproxy_port {
@@ -48,8 +60,8 @@ class shorewall::rules::libvirt::host (
if $masq_iface {
shorewall::masq {
"masq-${masq_iface}":
- interface => "$masq_iface",
- source => '10.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.168.0.0/16';
+ interface => $masq_iface,
+ source => '10.0.0.0/8,169.254.0.0/16,172.16.0.0/12,192.168.0.0/16';
}
}