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

[mirror/dsa-puppet.git] / modules / roles / manifests / ftp_master.pp

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 1da8871..2a15a9b 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -1,9 +1,13 @@
 class roles::ftp_master {
-       rsync::site { 'dakmaster':
-               source        => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
+       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,
+               tlsaport => [443, 1873],
        }
-        ssl::service { 'ftp-master.debian.org':
-                notify => Service['apache2'],
-        }
 }