Revert "Try to handle xinetd flags sanely"

[dsa-puppet.git] / modules / xinetd / templates / service.erb

diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index 8219f3933e4af069b851c2f7a78e590b3442b473..33a9de7a40f659edf8aeb990dd8d027b31d7d4fb 100644 (file)
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -2,14 +2,20 @@ 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') %>
 
-       socket_type     = <%= scope.lookupvar('stream') %>
+       socket_type     = <%= scope.lookupvar('socket_type') %>
        protocol        = <%= scope.lookupvar('protocol') %>
        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') %>