diff --git a/group_vars/samba-dc.yml b/group_vars/samba-dc.yml index 906ebc4..6a61a0d 100644 --- a/group_vars/samba-dc.yml +++ b/group_vars/samba-dc.yml @@ -16,7 +16,6 @@ samba_shares: samba_tls_enabled: true samba_tls_keyfile: /etc/pki/tls/private/samba.key samba_tls_certfile: /etc/pki/tls/certs/samba.cer -samba_tls_cafile: /etc/pki/tls/certs/samba-ca.crt collectd_processes: - name: samba diff --git a/roles/samba-dc/templates/smb.conf.j2 b/roles/samba-dc/templates/smb.conf.j2 index b998db7..d915378 100644 --- a/roles/samba-dc/templates/smb.conf.j2 +++ b/roles/samba-dc/templates/smb.conf.j2 @@ -20,9 +20,7 @@ tls enabled = yes tls keyfile = {{ samba_tls_keyfile }} tls certfile = {{ samba_tls_certfile }} -{% if samba_tls_cafile is defined %} - tls cafile = {{ samba_tls_cafile }} -{% endif %} + tls cafile = {{ samba_tls_cafile|d('') }} {% endif %} [netlogon]