From c2bf7e71d8598dbb05b5dee9f452b6332e9e916e Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 25 Apr 2017 15:28:26 +0200 Subject: make it possibble to disable ipv6 for these rules --- manifests/rules/out/puppet.pp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'manifests/rules/out/puppet.pp') diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp index cbe8cce..827e23a 100644 --- a/manifests/rules/out/puppet.pp +++ b/manifests/rules/out/puppet.pp @@ -1,7 +1,9 @@ +# 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, @@ -10,11 +12,12 @@ class shorewall::rules::out::puppet( } # 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'; } } -- 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/out/puppet.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/rules/out/puppet.pp') diff --git a/manifests/rules/out/puppet.pp b/manifests/rules/out/puppet.pp index 827e23a..2444dcb 100644 --- a/manifests/rules/out/puppet.pp +++ b/manifests/rules/out/puppet.pp @@ -9,6 +9,7 @@ class shorewall::rules::out::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': -- 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/out/puppet.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'manifests/rules/out/puppet.pp') 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'; -- cgit v1.2.3