From 93a102d0bd065f74e3489b7445cf400f9d779466 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 31 Jan 2016 22:38:53 +0100
Subject: [PATCH] split service and port in xinetd::service

---
 modules/rsync/manifests/site.pp      | 2 +-
 modules/vsftpd/manifests/site.pp     | 2 +-
 modules/xinetd/manifests/service.pp  | 5 +++--
 modules/xinetd/templates/service.erb | 5 ++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index c534b372b..0c278fb2e 100644
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -57,7 +57,7 @@ define rsync::site (
 			bind        => $bind6,
 			id          => "${name}-rsync6",
 			server      => '/usr/bin/rsync',
-			port        => 'rsync',
+			service     => 'rsync',
 			server_args => "--daemon --config=${fname_real}",
 			ferm        => false,
 			instances   => $max_clients,
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index f8a71a0fb..63f9ed67b 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -41,7 +41,7 @@ define vsftpd::site (
 		bind        => $bind,
 		id          => "${name}-ftp",
 		server      => '/usr/sbin/vsftpd',
-		port        => 'ftp',
+		service     => 'ftp',
 		server_args => $fname,
 		ferm        => false,
 		instances   => $max_clients,
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 5c8f954ad..2ece74c5a 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -1,7 +1,8 @@
 define xinetd::service (
 	$id,
 	$server,
-	$port,
+	$service,
+	$port=$service,
 	$bind='',
 	$type='',
 	$socket_type=stream,
@@ -27,7 +28,7 @@ define xinetd::service (
 
 	if $ferm {
 		@ferm::rule { "dsa-xinetd-${name}":
-			description => "Allow traffic to ${port}",
+			description => "Allow traffic to ${service}",
 			rule        => "&SERVICE(${protocol}, ${port})"
 		}
 	}
diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index d460f8235..0d89e8f41 100644
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -1,10 +1,13 @@
-service <%= scope.lookupvar('port') %>
+service <%= scope.lookupvar('services') %>
 {
 <%- if scope.lookupvar('bind') != '' -%>
 	bind		= <%= scope.lookupvar('bind') %>
 <%- end -%>
 <%- if scope.lookupvar('type') != '' -%>
 	type		= <%= scope.lookupvar('type') %>
+<%- end -%>
+<%- if scope.lookupvar('port') != '' -%>
+	port		= <%= scope.lookupvar('port') %>
 <%- end -%>
 	id		= <%= scope.lookupvar('id') %>
 
-- 
2.20.1