Fix stomping of certfile

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

diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index bb71850ee5656c9a63c82e13cb173fad5040df99..d460f82356d3eae83775bc7a7a804fd4e6e01617 100644 (file)
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -1,13 +1,25 @@
 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') %>
+<%- 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') %>