bacula::client -- support present/absent

[mirror/dsa-puppet.git] / modules / rsync / manifests / site.pp

diff --git a/modules/rsync/manifests/site.pp b/modules/rsync/manifests/site.pp
index 60cab39..8035dd4 100644 (file)
--- a/modules/rsync/manifests/site.pp
+++ b/modules/rsync/manifests/site.pp
@@ -112,15 +112,16 @@ define rsync::site (
                        provider => systemd,
                }
 
-               @ferm::rule { "rsync-${name}-ssl":
+               ferm::rule { "rsync-${name}-ssl":
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
                        rule        => '&SERVICE(tcp, 1873)',
                }
 
+               $certdir = hiera('paths.letsencrypt_dir')
                dnsextras::tlsa_record{ "tlsa-${sslname}-1873":
                        zone     => 'debian.org',
-                       certfile => [ "/srv/puppet.debian.org/from-letsencrypt/${sslname}.crt" ],
+                       certfile => [ "${certdir}/${sslname}.crt" ],
                        port     => 1873,
                        hostname => $sslname,
                }