projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix planet-backend.d.o
[mirror/dsa-puppet.git]
/
modules
/
rsync
/
manifests
/
site.pp
diff --git
a/modules/rsync/manifests/site.pp
b/modules/rsync/manifests/site.pp
index
7549694
..
7011787
100644
(file)
--- a/
modules/rsync/manifests/site.pp
+++ b/
modules/rsync/manifests/site.pp
@@
-118,12
+118,10
@@
define rsync::site (
rule => '&SERVICE(tcp, 1873)',
}
rule => '&SERVICE(tcp, 1873)',
}
+ $certdir = hiera('paths.letsencrypt_dir')
dnsextras::tlsa_record{ "tlsa-${sslname}-1873":
zone => 'debian.org',
dnsextras::tlsa_record{ "tlsa-${sslname}-1873":
zone => 'debian.org',
- certfile => [
- "/etc/puppet/modules/ssl/files/servicecerts/${sslname}.crt",
- "/etc/puppet/modules/ssl/files/from-letsencrypt/${sslname}.crt",
- ],
+ certfile => [ "${certdir}/${sslname}.crt" ],
port => 1873,
hostname => $sslname,
}
port => 1873,
hostname => $sslname,
}