From 318f35099edc97f19ac8d9130af0303308701bb3 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 31 May 2015 15:33:26 +0100 Subject: [PATCH] fix ldap.conf for jessie hosts Signed-off-by: Stephen Gran --- modules/debian-org/manifests/init.pp | 2 +- .../debian-org/{files/ldap.conf => templates/ldap.conf.erb} | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename modules/debian-org/{files/ldap.conf => templates/ldap.conf.erb} (83%) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 8b0d62b57..2c295df22 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -283,7 +283,7 @@ class debian-org { } file { '/etc/ldap/ldap.conf': require => Package['debian.org'], - source => 'puppet:///modules/debian-org/ldap.conf', + content => template('debian-org/ldap.conf.erb'), } file { '/etc/pam.d/common-session': require => Package['debian.org'], diff --git a/modules/debian-org/files/ldap.conf b/modules/debian-org/templates/ldap.conf.erb similarity index 83% rename from modules/debian-org/files/ldap.conf rename to modules/debian-org/templates/ldap.conf.erb index e60b6a914..1a6828dea 100644 --- a/modules/debian-org/files/ldap.conf +++ b/modules/debian-org/templates/ldap.conf.erb @@ -20,5 +20,9 @@ URI ldap://db.debian.org BASE dc=debian,dc=org +<% if @lsbmajdistrelease >= 8 -%> +TLS_CACERT /etc/ssl/ca-debian/ca-certificates.crt +<% else -%> TLS_CACERT /etc/ssl/servicecerts/db.debian.org.crt +<% end -%> TLS_REQCERT hard -- 2.20.1