From: Stephen Gran <steve@lobefin.net>
Date: Mon, 13 Aug 2012 07:17:32 +0000 (+0100)
Subject: add support for type and group
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dfba585ed294f4238c01f7df1aaddbc86cdcd753;p=mirror%2Fdsa-puppet.git

add support for type and group

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index d81218005..522af17c4 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -3,11 +3,13 @@ define xinetd::service (
 	$server,
 	$port,
 	$bind='',
+	$type='',
 	$socket_type=stream,
 	$protocol=tcp,
 	$flags=IPv6,
 	$wait=no,
 	$user=root,
+	$group='',
 	$server_args='',
 	$nice=10,
 	$instances=100,
diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index 80e0c4971..33a9de7a4 100644
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -2,6 +2,9 @@ service <%= scope.lookupvar('port') %>
 {
 <%- if scope.lookupvar('bind') != '' -%>
 	bind		= <%= scope.lookupvar('bind') %>
+<%- end -%>
+<%- if scope.lookupvar('type') != '' -%>
+	type		= <%= scope.lookupvar('type') %>
 <%- end -%>
 	id		= <%= scope.lookupvar('id') %>
 
@@ -10,6 +13,9 @@ service <%= scope.lookupvar('port') %>
 	flags		= <%= scope.lookupvar('flags') %>
 	wait		= <%= scope.lookupvar('wait') %>
 	user		= <%= scope.lookupvar('user') %>
+<%- if scope.lookupvar('group') != '' -%>
+	group		= <%= scope.lookupvar('group') %>
+<%- end -%>
 	server		= <%= scope.lookupvar('server') %>
 	server_args	= <%= scope.lookupvar('server_args') %>
 	nice		= <%= scope.lookupvar('nice') %>