playbooks/trixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use ansible_domain everywhere and bail out if it is empty.

Browse source
This commit is contained in:
Andreas B. Mundt 2019-11-21 15:47:08 +01:00
parent bbcf45bbeb
commit ed8b7a7fa6
12 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/krb5-kdc-ldap/templates/kadm5.acl.j2
View file

@ -1,4 +1,4 @@
## access controls for the Kerberos KDC
root/admin@{{ ldap_domain | upper }} *
*@{{ ldap_domain | upper }} cil
*/*@{{ ldap_domain | upper }} i
root/admin@{{ ansible_domain | upper }} *
*@{{ ansible_domain | upper }} cil
*/*@{{ ansible_domain | upper }} i

2
roles/krb5-kdc-ldap/templates/kdc.conf.j2
View file

@ -2,7 +2,7 @@
kdc_ports = 750,88
[realms]
{{ ldap_domain | upper }} = {
{{ ansible_domain | upper }} = {
admin_keytab = FILE:/etc/krb5kdc/kadm5.keytab
acl_file = /etc/krb5kdc/kadm5.acl
key_stash_file = /etc/krb5kdc/stash

8
roles/krb5-kdc-ldap/templates/krb5.conf.j2
View file

@ -1,16 +1,16 @@
[libdefaults]
default_realm = {{ ldap_domain | upper }}
default_realm = {{ ansible_domain | upper }}
[realms]
{{ ldap_domain | upper }} = {
{{ ansible_domain | upper }} = {
kdc = {{ ansible_hostname }}
admin_server = {{ ansible_hostname }}
database_module = LDAP
}
[domain_realm]
.{{ ldap_domain }} = {{ ldap_domain | upper }}
{{ ldap_domain }} = {{ ldap_domain | upper }}
.{{ ansible_domain }} = {{ ansible_domain | upper }}
{{ ansible_domain }} = {{ ansible_domain | upper }}
[dbdefaults]
ldap_kerberos_container_dn = cn=kerberos,{{ basedn }}