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

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

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index 379fae2..f6935e1 100644 (file)
--- 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',
+               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],
        }
 }