diff options
| author | mh <mh@immerda.ch> | 2017-04-08 14:07:07 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2017-04-08 14:07:07 +0200 |
| commit | 75f0f1dbaa0827f64fb0d21db8f4a89296f177e0 (patch) | |
| tree | c252d8c392f0ecdf49d4214ae2d80d53e3f6dcc6 | |
| parent | 4b5ea4bec4b6abb6abed8005bce1c8071ef97ffa (diff) | |
migrate to dedicated params
| -rw-r--r-- | manifests/rules/munin.pp | 27 | ||||
| -rw-r--r-- | manifests/rules/puppet.pp | 3 |
2 files changed, 17 insertions, 13 deletions
diff --git a/manifests/rules/munin.pp b/manifests/rules/munin.pp index a20a4e0..252f2ed 100644 --- a/manifests/rules/munin.pp +++ b/manifests/rules/munin.pp @@ -1,16 +1,19 @@ +# outgoing munin rules class shorewall::rules::munin( - $munin_port = '4949', - $munin_collector = ['127.0.0.1'], + $munin_port = '4949', + $munin_collector = ['127.0.0.1'], $collector_source = 'net' ){ - shorewall::params { 'MUNINPORT': value => $munin_port } - shorewall::params { 'MUNINCOLLECTOR': value => join(any2array($munin_collector),',') } - shorewall::rule{'net-me-munin-tcp': - source => "${collector_source}:\$MUNINCOLLECTOR", - destination => '$FW', - proto => 'tcp', - destinationport => '$MUNINPORT', - order => 240, - action => 'ACCEPT'; - } + shorewall::params4{ + 'MUNINPORT': value => $munin_port; + 'MUNINCOLLECTOR': value => join(any2array($munin_collector),','); + } + shorewall::rule{'net-me-munin-tcp': + source => "${collector_source}:\$MUNINCOLLECTOR", + destination => '$FW', + proto => 'tcp', + destinationport => '$MUNINPORT', + order => 240, + action => 'ACCEPT'; + } } diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp index 84e7d81..ee920b0 100644 --- a/manifests/rules/puppet.pp +++ b/manifests/rules/puppet.pp @@ -1,9 +1,10 @@ +# outgoing puppet params class shorewall::rules::puppet( $puppetserver = "puppet.${::domain}", $puppetserver_port = 8140, $puppetserver_signport = 8141 ){ - shorewall::params{ + shorewall::params4{ 'PUPPETSERVER': value => $puppetserver; 'PUPPETSERVER_PORT': value => $puppetserver_port; 'PUPPETSERVER_SIGN_PORT': value => $puppetserver_signport; |