X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fxinetd%2Ftemplates%2Fservice.erb;h=c969b33679c7f2c216a020fdd4a8b4e82a14556e;hb=7709c4b48f7dced425db4b14613c07cf0642e0b1;hp=a0cc45a511d4720990e5752d756d7245271139dc;hpb=55a3c128c301b245a78905f794de915dab2f89eb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index a0cc45a51..c969b3367 100644
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -1,10 +1,18 @@
-service <%= scope.lookupvar('port') %>
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+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') %>
 
@@ -12,7 +20,7 @@ service <%= scope.lookupvar('port') %>
 	protocol	= <%= scope.lookupvar('protocol') %>
 <%- if scope.lookupvar('flags') != '' -%>
 	flags		= <%= scope.lookupvar('flags') %>
-<%- elsif scope.lookupvar('bind') =~  /:/ -%>
+<%- elsif scope.lookupvar('bind') =~  /:/ or scope.lookupvar('bind') == "" -%>
 	flags		= IPv6
 <%- end -%>
 	wait		= <%= scope.lookupvar('wait') %>