X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Ftemplates%2Fservice.erb;h=981f5a2ebe57b411c053e926dc4ebd9a4adace0f;hb=b0f4517c6a00d27e50dd778fbd6316f1045c5b2a;hp=bb71850ee5656c9a63c82e13cb173fad5040df99;hpb=34ffa51d586aa81dd7223483a6ab282fdd27b5b1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index bb71850ee..981f5a2eb 100644
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -1,13 +1,28 @@
-service <%= scope.lookupvar('port') %>
+service <%= scope.lookupvar('service') %>
 {
+<%- 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') %>
 
-	socket_type	= <%= scope.lookupvar('stream') %>
+	socket_type	= <%= scope.lookupvar('socket_type') %>
 	protocol	= <%= scope.lookupvar('protocol') %>
+<%- if scope.lookupvar('flags') != '' -%>
 	flags		= <%= scope.lookupvar('flags') %>
+<%- elsif scope.lookupvar('bind') =~  /:/ or scope.lookupvar('bind') == "" -%>
+	flags		= IPv6
+<%- end -%>
 	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') %>