diff options
author | Micah Anderson <micah@riseup.net> | 2018-01-13 11:13:23 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2018-01-13 11:13:23 -0500 |
commit | 4cf7030c0c1f9977d297d502f736029e57e36d40 (patch) | |
tree | c2219300400d0a455e8e0aba0df19c83a6de8121 /manifests/rules/puppet.pp | |
parent | 7332777829c19a63ce3d9bc50a2ddd40b940743a (diff) | |
parent | fab57483f46bab58275063081c5e4e6f7db9d2ab (diff) |
Merge remote-tracking branch 'immerda/master' into immerda_merge
Diffstat (limited to 'manifests/rules/puppet.pp')
-rw-r--r-- | manifests/rules/puppet.pp | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp index 84e7d81..dcb88f5 100644 --- a/manifests/rules/puppet.pp +++ b/manifests/rules/puppet.pp @@ -1,11 +1,40 @@ +# outgoing puppet params class shorewall::rules::puppet( - $puppetserver = "puppet.${::domain}", - $puppetserver_port = 8140, - $puppetserver_signport = 8141 + $puppetserver = "puppet.${::domain}", + $puppetserver_v6 = undef, + $puppetserver_port = 8140, + $puppetserver_signport = 8141, + $shorewall6 = true, ){ shorewall::params{ - 'PUPPETSERVER': value => $puppetserver; - 'PUPPETSERVER_PORT': value => $puppetserver_port; - 'PUPPETSERVER_SIGN_PORT': value => $puppetserver_signport; + 'PUPPETSERVER_PORT': + value => $puppetserver_port, + shorewall6 => $shorewall6; + 'PUPPETSERVER_SIGN_PORT': + value => $puppetserver_signport, + shorewall6 => $shorewall6, + } + if is_ipv4_address($puppetserver){ + shorewall::params4{ + 'PUPPETSERVER': + value => $puppetserver; + } + if $puppetserver_v6 { + shorewall::params6{ + 'PUPPETSERVER': + value => $puppetserver_v6; + } + } + } elsif is_ipv6_address($puppetserver){ + shorewall::params6{ + 'PUPPETSERVER': + value => $puppetserver; + } + } else { + shorewall::params{ + 'PUPPETSERVER': + value => $puppetserver, + shorewall6 => $shorewall6; + } } } |