summaryrefslogtreecommitdiff
path: root/manifests/rules/out/puppet.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2018-01-13 11:13:23 -0500
committerMicah Anderson <micah@riseup.net>2018-01-13 11:13:23 -0500
commit4cf7030c0c1f9977d297d502f736029e57e36d40 (patch)
treec2219300400d0a455e8e0aba0df19c83a6de8121 /manifests/rules/out/puppet.pp
parent7332777829c19a63ce3d9bc50a2ddd40b940743a (diff)
parentfab57483f46bab58275063081c5e4e6f7db9d2ab (diff)
Merge remote-tracking branch 'immerda/master' into immerda_merge
Diffstat (limited to 'manifests/rules/out/puppet.pp')
-rw-r--r--manifests/rules/out/puppet.pp22
1 files changed, 13 insertions, 9 deletions
diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp
index cbe8cce..2444dcb 100644
--- a/manifests/rules/out/puppet.pp
+++ b/manifests/rules/out/puppet.pp
@@ -1,20 +1,24 @@
+# outgoing puppet traffic
class shorewall::rules::out::puppet(
- $puppetserver = "puppet.${::domain}",
- $puppetserver_port = 8140,
- $puppetserver_signport = 8141
+ $puppetserver = "puppet.${::domain}",
+ $puppetserver_port = 8140,
+ $puppetserver_signport = 8141,
+ $shorewall6 = true,
) {
class{'shorewall::rules::puppet':
puppetserver => $puppetserver,
puppetserver_port => $puppetserver_port,
puppetserver_signport => $puppetserver_signport,
+ shorewall6 => $shorewall6,
}
# we want to connect to the puppet server
shorewall::rule { 'me-net-puppet_tcp':
- source => '$FW',
- destination => 'net:$PUPPETSERVER',
- proto => 'tcp',
- destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT',
- order => 340,
- action => 'ACCEPT';
+ source => '$FW',
+ destination => 'net:$PUPPETSERVER',
+ proto => 'tcp',
+ destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT',
+ order => 340,
+ shorewall6 => $shorewall6,
+ action => 'ACCEPT';
}
}