diff --git a/playbooks/nas.yml b/playbooks/nas.yml index 8711df4..3c77143 100644 --- a/playbooks/nas.yml +++ b/playbooks/nas.yml @@ -21,7 +21,7 @@ roles: - base - - kerberos/client + - kerberos - sssd - nfs-server - role: kerberos/keytab diff --git a/roles/cups/server/meta/main.yml b/roles/cups/server/meta/main.yml index 83ea3bb..3dabdf0 100644 --- a/roles/cups/server/meta/main.yml +++ b/roles/cups/server/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - - {role: kerberos/client} + - {role: kerberos} diff --git a/roles/kerberos/client/tasks/main.yml b/roles/kerberos/client/tasks/main.yml deleted file mode 100644 index b665f4f..0000000 --- a/roles/kerberos/client/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: install kerberos client packages - package: - name: krb5-workstation - state: installed - -- name: configure kerberos client - template: - dest: /etc/krb5.conf.d/realm.conf - src: realm.conf.j2 - mode: 0644 - owner: root - group: "{{ ansible_wheel }}" diff --git a/roles/kerberos/client/templates/realm.conf.j2 b/roles/kerberos/client/templates/realm.conf.j2 deleted file mode 100644 index 9680b47..0000000 --- a/roles/kerberos/client/templates/realm.conf.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[libdefaults] -default_realm = {{ kerberos_realm }} - -[realms] -{{ kerberos_realm }} = { - kdc = https://id.foo.sh/KdcProxy -} - -[domain_realm] -.{{ kerberos_realm|lower() }} = {{ kerberos_realm }} -{{ kerberos_realm|lower() }} = {{ kerberos_realm }} diff --git a/roles/ldap-server/meta/main.yml b/roles/ldap-server/meta/main.yml index 82ede77..d2e19c5 100644 --- a/roles/ldap-server/meta/main.yml +++ b/roles/ldap-server/meta/main.yml @@ -2,6 +2,6 @@ dependencies: - {role: dhparams} - - {role: kerberos/client} + - {role: kerberos} - {role: ldap} - {role: saslauthd} diff --git a/roles/mod_auth_gssapi/meta/main.yml b/roles/mod_auth_gssapi/meta/main.yml index 42b3bee..3fb63d4 100644 --- a/roles/mod_auth_gssapi/meta/main.yml +++ b/roles/mod_auth_gssapi/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - {role: apache} - - {role: kerberos/client} + - {role: kerberos} diff --git a/roles/nfs-client/meta/main.yml b/roles/nfs-client/meta/main.yml index 6bfa377..14a902c 100644 --- a/roles/nfs-client/meta/main.yml +++ b/roles/nfs-client/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - {role: kerberos/client} + - {role: kerberos} diff --git a/roles/sssd/meta/main.yml b/roles/sssd/meta/main.yml index 2d00a9c..6e3559c 100644 --- a/roles/sssd/meta/main.yml +++ b/roles/sssd/meta/main.yml @@ -1,4 +1,4 @@ --- dependencies: - - {role: kerberos/client} + - {role: kerberos} - {role: ldap}