Merge remote-tracking branch 'waldi/rsyncd-unify'

* waldi/rsyncd-unify:
  Unify rsyncd module comments
  Extract default rsyncd module parameter
  De-list all rsync shares on ftp/ports/security-master

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index 379fae2..74b3c1f 100644 (file)
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -1,10 +1,12 @@
 class roles::keyring {
-       rsync::site { 'keyring':
-               source => 'puppet:///modules/roles/keyring/rsyncd.conf',
+       rsync::site_systemd { 'keyring':
+               source  => 'puppet:///modules/roles/keyring/rsyncd.conf',
+               sslname => 'keyring.debian.org',
        }
 
        ssl::service { 'keyring.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 }

diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index c348579..1aee3b9 100644 (file)
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,10 +19,21 @@ define xinetd::service (
        $ensure=present,
        $ferm=true
 ) {
-       include xinetd
-
        case $ensure {
-               present,absent,file: {}
+               present,file: {
+                       include xinetd
+                       file { "/etc/xinetd.d/${name}":
+                               ensure  => $ensure,
+                               content => template('xinetd/service.erb'),
+                               notify  => Service['xinetd'],
+                               require => Package['xinetd'],
+                       }
+               }
+               absent: {
+                       file { "/etc/xinetd.d/${name}":
+                               ensure  => $ensure,
+                       }
+               }
                default: { fail("Invalid ensure for '$name'") }
        }
 
@@ -37,11 +48,4 @@ define xinetd::service (
                        rule        => "&SERVICE(${protocol}, ${fermport})"
                }
        }
-
-       file { "/etc/xinetd.d/${name}":
-               ensure  => $ensure,
-               content => template('xinetd/service.erb'),
-               notify  => Service['xinetd'],
-               require => Package['xinetd'],
-       }
 }