From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 21:47:15 +0000 (+0100)
Subject: fermport for xinetd::service
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=89e8467b0e9b23c4246d96068adaa665931cbec7;hp=058779c430eb249a92378bf98142def86a319d3a;p=mirror%2Fdsa-puppet.git

fermport for xinetd::service
---

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 2ece74c5a..c348579fa 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -2,7 +2,7 @@ define xinetd::service (
 	$id,
 	$server,
 	$service,
-	$port=$service,
+	$port='',
 	$bind='',
 	$type='',
 	$socket_type=stream,
@@ -27,9 +27,14 @@ define xinetd::service (
 	}
 
 	if $ferm {
+		$fermport = $port ? {
+			"" => $service,
+			default => $port
+		}
+
 		@ferm::rule { "dsa-xinetd-${name}":
 			description => "Allow traffic to ${service}",
-			rule        => "&SERVICE(${protocol}, ${port})"
+			rule        => "&SERVICE(${protocol}, ${fermport})"
 		}
 	}