From: Bastian Blank <waldi@debian.org>
Date: Fri, 10 Feb 2017 20:00:01 +0000 (+0100)
Subject: Use rsyncd via systemd on ftp_master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=591ca2bf4a911c072b8bc6aef2486765bb6d52f6;p=mirror%2Fdsa-puppet.git

Use rsyncd via systemd on ftp_master
---

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 357b0d0e8..2a15a9b3e 100644
--- 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],
 	}
 }