Merge branch 'ldap-auth' into 'staging'

ldap-auth re-merge

See merge request dsa/ansible-dsa!41

group_vars/all.yml

@@ -7,11 +7,11 @@ deploy_uid: 5555
 deploy_key: "{{ lookup('file', 'files/keys/ansible') }}"
 
 # LDAP
-sssd_ldap_cert: "{{ role_path }}/../../files/CardiffRootCert.crt"
+sssd_ldap_cert: "{{ role_path }}/../../files/Cardiff-University-Root-Web-Combine.pem"
+sssd_ldap_server: 'ldap-auth.cf.ac.uk'
 sssd_ldap_search_base: 'o=CF'
 sssd_ldap_user_search_base: "{{ sssd_ldap_search_base }}"
 sssd_ldap_group_search_base: 'o=Resources'
-sssd_ldap_server: 'ldap-jccs.cf.ac.uk'
 sssd_ldap_uri: "ldap://{{ sssd_ldap_server }}/"
 sssd_offline_expiry: 365
 sssd_offline_attempts: 10

host_vars/ajr-Latitude-5490.yml

@@ -3,6 +3,3 @@
 
 ansible_branch: 'staging'
 cups_overwrite: false
-
-sssd_ldap_cert: "{{ role_path }}/../../files/Cardiff-University-Root-Web-Combine.pem"
-sssd_ldap_server: 'ldap-auth.cf.ac.uk'

host_vars/dsa-laptop1.yml

@@ -2,6 +2,3 @@
 # file: host_vars/dsa-laptop1.yml
 
 ansible_branch: 'staging'
-
-sssd_ldap_cert: "{{ role_path }}/../../files/Cardiff-University-Root-Web-Combine.pem"
-sssd_ldap_server: 'ldap-auth.cf.ac.uk'

host_vars/sophocles.yml

@@ -3,6 +3,3 @@
 
 ansible_branch: 'staging'
 cups_overwrite: false
-
-sssd_ldap_cert: "{{ role_path }}/../../files/Cardiff-University-Root-Web-Combine.pem"
-sssd_ldap_server: 'ldap-auth.cf.ac.uk'