Merge remote-tracking branch 'waldi/rsync-systemd-master'

* waldi/rsync-systemd-master:
  Use rsyncd via system on security_master
  Use rsyncd via systemd on ftp_master
  Use rsyncd via systemd on archive_master

diff --git a/modules/roles/manifests/archive_master.pp b/modules/roles/manifests/archive_master.pp
index 04548a5..c6223b0 100644 (file)
--- a/modules/roles/manifests/archive_master.pp
+++ b/modules/roles/manifests/archive_master.pp
@@ -1,14 +1,14 @@
 class roles::archive_master {
        $sslname = 'archive-master.debian.org'
 
-       rsync::site { 'archive_master':
-               source        => 'puppet:///modules/roles/archive_master/rsyncd.conf',
-               max_clients   => 100,
-               sslname       => $sslname,
+       rsync::site_systemd { 'archive_master':
+               source      => 'puppet:///modules/roles/archive_master/rsyncd.conf',
+               max_clients => 100,
+               sslname     => $sslname,
        }
 
        ssl::service { $sslname:
-               key => true,
-               tlsaport => [],
+               key      => true,
+               tlsaport => [1873],
        }
 }

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 357b0d0..2a15a9b 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,12 +1,13 @@
 class roles::ftp_master {
-       rsync::site { 'dakmaster':
-               source        => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
-               max_clients   => 100,
-               sslname       => 'ftp-master.debian.org',
+       rsync::site_systemd { 'dakmaster':
+               source      => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
+               max_clients => 100,
+               sslname     => 'ftp-master.debian.org',
        }
 
        ssl::service { 'ftp-master.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 }

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index a96dbec..35fb510 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,8 +1,8 @@
 class roles::security_master {
-
        ssl::service { 'security-master.debian.org':
-               notify  => Exec['service apache2 reload'],
-               key => true,
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 
        vsftpd::site { 'security':
@@ -13,9 +13,9 @@ class roles::security_master {
                root       => '/srv/ftp.root/',
        }
 
-       rsync::site { 'security_master':
-               source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
+       rsync::site_systemd { 'security_master':
+               source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
                max_clients => 100,
-               sslname => "security-master.debian.org",
+               sslname     => 'security-master.debian.org',
        }
 }