Merge remote-tracking branch 'waldi/keyring-ssl'

* waldi/keyring-ssl:
  Enable rsync-ssl on keyring.debian.org

Conflicts:
	modules/roles/manifests/keyring.pp

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index f6935e1..74b3c1f 100644 (file)
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -1,5 +1,5 @@
 class roles::keyring {
-       rsync::site { 'keyring':
+       rsync::site_systemd { 'keyring':
                source  => 'puppet:///modules/roles/keyring/rsyncd.conf',
                sslname => 'keyring.debian.org',
        }