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

Use rsyncd via system on security_master
---

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index a96dbec50..35fb5103a 100644
--- 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',
 	}
 }