From 75f0f1dbaa0827f64fb0d21db8f4a89296f177e0 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 8 Apr 2017 14:07:07 +0200 Subject: migrate to dedicated params --- manifests/rules/puppet.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'manifests/rules/puppet.pp') 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; -- cgit v1.2.3 From 4b9c6e1714857a702add52b1176eb65d347ac71d Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 3 Aug 2017 10:17:00 +0200 Subject: make it possible to set v6 and v6 puppetserver --- manifests/rules/puppet.pp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'manifests/rules/puppet.pp') diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp index ee920b0..6cb0282 100644 --- a/manifests/rules/puppet.pp +++ b/manifests/rules/puppet.pp @@ -1,12 +1,30 @@ # outgoing puppet params class shorewall::rules::puppet( - $puppetserver = "puppet.${::domain}", - $puppetserver_port = 8140, + $puppetserver = "puppet.${::domain}", + $puppetserver_v6 = undef, + $puppetserver_port = 8140, $puppetserver_signport = 8141 ){ - shorewall::params4{ - 'PUPPETSERVER': value => $puppetserver; + shorewall::params{ 'PUPPETSERVER_PORT': value => $puppetserver_port; 'PUPPETSERVER_SIGN_PORT': value => $puppetserver_signport; } + if is_ipv4_address($puppetserver){ + shorewall::params4{ + 'PUPPETSERVER': value => $puppetserver; + } + if $puppetserver_v6 { + shorewall::params6{ + 'PUPPETSERVER': value => $puppetserver; + } + } + } elsif is_ipv6_address($puppetserver){ + shorewall::params6{ + 'PUPPETSERVER': value => $puppetserver; + } + } else { + shorewall::params{ + 'PUPPETSERVER': value => $puppetserver; + } + } } -- cgit v1.2.3 From 983ae4c5bc61b09422b671123e670d62cb4e2e59 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 29 Aug 2017 22:14:33 +0200 Subject: correctly set shorewall6 option for puppetserver config --- manifests/rules/puppet.pp | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'manifests/rules/puppet.pp') diff --git a/manifests/rules/puppet.pp b/manifests/rules/puppet.pp index 6cb0282..dcb88f5 100644 --- a/manifests/rules/puppet.pp +++ b/manifests/rules/puppet.pp @@ -3,28 +3,38 @@ class shorewall::rules::puppet( $puppetserver = "puppet.${::domain}", $puppetserver_v6 = undef, $puppetserver_port = 8140, - $puppetserver_signport = 8141 + $puppetserver_signport = 8141, + $shorewall6 = true, ){ shorewall::params{ - '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; + 'PUPPETSERVER': + value => $puppetserver; } if $puppetserver_v6 { shorewall::params6{ - 'PUPPETSERVER': value => $puppetserver; + 'PUPPETSERVER': + value => $puppetserver_v6; } } } elsif is_ipv6_address($puppetserver){ shorewall::params6{ - 'PUPPETSERVER': value => $puppetserver; + 'PUPPETSERVER': + value => $puppetserver; } } else { shorewall::params{ - 'PUPPETSERVER': value => $puppetserver; + 'PUPPETSERVER': + value => $puppetserver, + shorewall6 => $shorewall6; } } } -- cgit v1.2.3 From 8d57c328374b6badc4accd454315b4457965d9e1 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Fri, 16 Feb 2018 15:11:22 -0500 Subject: Remove $puppetserver_signport, fixes #8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ng  lavamind: this is an acient relict, where there was a problem signing through apache ng  and then we had a mongrel running on that port --- manifests/rules/puppet.pp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'manifests/rules/puppet.pp') 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{ -- cgit v1.2.3