diff options
| author | Micah <micah@riseup.net> | 2018-03-23 14:07:23 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2018-03-23 14:07:23 +0000 |
| commit | 04ec5801350eb4e0b290fb0b585bfc592452c3ce (patch) | |
| tree | d39c3bd1366c1f0cb62f7b5f9b33b83092e460aa | |
| parent | 9f9d741a3417dc560a586c7143d6a7ca7c8f6cb6 (diff) | |
| parent | 8d57c328374b6badc4accd454315b4457965d9e1 (diff) | |
Merge branch 'fix_8' into 'master'
Remove $puppetserver_signport, fixes #8
Closes #8
See merge request shared-puppet-modules-group/shorewall!12
| -rw-r--r-- | manifests/rules/out/puppet.pp | 4 | ||||
| -rw-r--r-- | manifests/rules/puppet.pp | 4 | ||||
| -rw-r--r-- | manifests/rules/puppet/master.pp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp index 2444dcb..ac13bbb 100644 --- a/manifests/rules/out/puppet.pp +++ b/manifests/rules/out/puppet.pp @@ -2,13 +2,11 @@ class shorewall::rules::out::puppet( $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 @@ -16,7 +14,7 @@ class shorewall::rules::out::puppet( source => '$FW', destination => 'net:$PUPPETSERVER', proto => 'tcp', - destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT', + destinationport => '$PUPPETSERVER_PORT', order => 340, shorewall6 => $shorewall6, action => 'ACCEPT'; diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp index dcb88f5..3c90370 100644 --- a/manifests/rules/puppet.pp +++ b/manifests/rules/puppet.pp @@ -3,16 +3,12 @@ class shorewall::rules::puppet( $puppetserver = "puppet.${::domain}", $puppetserver_v6 = undef, $puppetserver_port = 8140, - $puppetserver_signport = 8141, $shorewall6 = true, ){ shorewall::params{ 'PUPPETSERVER_PORT': value => $puppetserver_port, shorewall6 => $shorewall6; - 'PUPPETSERVER_SIGN_PORT': - value => $puppetserver_signport, - shorewall6 => $shorewall6, } if is_ipv4_address($puppetserver){ shorewall::params4{ diff --git a/manifests/rules/puppet/master.pp b/manifests/rules/puppet/master.pp index 925979c..56b9f0b 100644 --- a/manifests/rules/puppet/master.pp +++ b/manifests/rules/puppet/master.pp @@ -3,7 +3,7 @@ class shorewall::rules::puppet::master { source => 'net', destination => '$FW', proto => 'tcp', - destinationport => '$PUPPETSERVER_PORT,$PUPPETSERVER_SIGN_PORT', + destinationport => '$PUPPETSERVER_PORT', order => 240, action => 'ACCEPT'; } |