From 8d57c328374b6badc4accd454315b4457965d9e1 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jerome@riseup.net>
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 +---
 manifests/rules/puppet.pp        | 4 ----
 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';
   }
-- 
cgit v1.2.3