From 89ae13d5739449ab549996865f763222abe0ec0d Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 22 Jan 2021 18:12:45 +0100 Subject: [PATCH] Other leftovers. --- defaults/main.yml | 3 ++- templates/nslcd.conf.j2 | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 175f95b..463332b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,8 @@ --- ldap_uri: "ldap://ldap.example.org" ldap_base_dn: "dc=example,dc=org" -ldap_tls_deb_cacert: /etc/ssl/certs/ca-certificates.crt +ldap_tls_deb_cacert_dir: /etc/ssl/certs +ldap_tls_deb_cacert: '{{ ldap_tls_deb_cacert_dir }}/ca-certificates.crt' ldap_version: 3 ldap_nss_ignoreusers: 'avahi,backup,bin,daemon,games,gnats,irc,libuuid,list,lp,mail,man,messagebus,munin,news,nslcd,proxy,root,sshd,sync,sys,syslog,uucp,www-data' diff --git a/templates/nslcd.conf.j2 b/templates/nslcd.conf.j2 index e511269..3241e68 100644 --- a/templates/nslcd.conf.j2 +++ b/templates/nslcd.conf.j2 @@ -14,8 +14,8 @@ base {{ ldap_base_dn }} # The LDAP protocol version to use. ldap_version 3 -tls_cacertdir /etc/ssl/certs -tls_cacertfile {{ r_connector_nslcd_cafile }} +tls_cacertdir {{ ldap_tls_deb_cacert_dir }} +tls_cacertfile {{ ldap_tls_deb_cacert }} {% if nslcd_authenticated_bind %} # The DN to bind with for normal lookups.