Revert "Try to handle xinetd flags sanely"

This reverts commit aae8b555c902a217d68dc96ccd50ae6144e8e686.

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 6a4284a3ce846b2fa9819b5cc84355cf17867d20..bb2ee1446170260dab55fa5bd34b38e07e8f6196 100644 (file)
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -1,6 +1,5 @@
 define rsync::site (
        $bind='',
-       $bind6='',
        $source='',
        $content='',
        $fname='',
@@ -40,7 +39,6 @@ define rsync::site (
 
        xinetd::service { "rsync-${name}":
                bind        => $bind,
-               bind6       => $bind6,
                id          => "${name}-rsync",
                server      => '/usr/bin/rsync',
                port        => 'rsync',

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 5c8f954ad340594cdf747ff1aa6b4cef95245e71..522af17c4c83c5a749eecd2a52618886c94b1eae 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -6,7 +6,7 @@ define xinetd::service (
        $type='',
        $socket_type=stream,
        $protocol=tcp,
-       $flags='',
+       $flags=IPv6,
        $wait=no,
        $user=root,
        $group='',

diff --git a/modules/xinetd/templates/service.erb b/modules/xinetd/templates/service.erb
index 9478c1d138aaba88e3c6e284539742b5c12f1f13..33a9de7a40f659edf8aeb990dd8d027b31d7d4fb 100644 (file)
--- a/modules/xinetd/templates/service.erb
+++ b/modules/xinetd/templates/service.erb
@@ -10,11 +10,7 @@ service <%= scope.lookupvar('port') %>
 
        socket_type     = <%= scope.lookupvar('socket_type') %>
        protocol        = <%= scope.lookupvar('protocol') %>
-<%- if scope.lookupvar('flags') != '' -%>
        flags           = <%= scope.lookupvar('flags') %>
-<%- elsif scope.lookupvar('bind') =~  ':' -%>
-       flags           = IPv6
-<%- end -%>
        wait            = <%= scope.lookupvar('wait') %>
        user            = <%= scope.lookupvar('user') %>
 <%- if scope.lookupvar('group') != '' -%>