From: Bastian Blank <waldi@debian.org>
Date: Fri, 3 Feb 2017 17:34:28 +0000 (+0100)
Subject: Enable rsync-ssl on keyring.debian.org
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7f18f21c8a9d538bac4a1ae874b492a80f432623;p=mirror%2Fdsa-puppet.git

Enable rsync-ssl on keyring.debian.org
---

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index 379fae21c..74b3c1fdf 100644
--- 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],
 	}
 }