diff --git a/playbooks/ood.yml b/playbooks/ood.yml index f231a3146..1efb52152 100644 --- a/playbooks/ood.yml +++ b/playbooks/ood.yml @@ -47,8 +47,6 @@ when: - ansible_distribution == 'CentOS' - ansible_distribution_major_version == '7' - - when: - authentication.httpd_auth is defined - authentication.httpd_auth == 'basic' @@ -70,16 +68,6 @@ - name: Set up PAM authentication for OOD include_role: name: ood_pam_auth - when: - - ((ansible_distribution == 'CentOS') and (ansible_distribution_major_version == '7')) or (ansible_distribution == 'Ubuntu') - - - name: Set up mod_authnz_external modules (for cyclecloud proxy) - yum: - name: mod_authnz_external,pwauth - lock_timeout: 180 - when: - - ansible_distribution == 'AlmaLinux' - - ansible_distribution_major_version == '8' - name: Retrieve OIDC secret block: diff --git a/playbooks/roles/ood_pam_auth/tasks/AlmaLinux/8.yml b/playbooks/roles/ood_pam_auth/tasks/AlmaLinux/8.yml index 9a8a38990..52d67a642 100644 --- a/playbooks/roles/ood_pam_auth/tasks/AlmaLinux/8.yml +++ b/playbooks/roles/ood_pam_auth/tasks/AlmaLinux/8.yml @@ -1,21 +1,6 @@ --- -- name: Install mod_authnz_pam +- name: Set up mod_authnz_external modules (for cyclecloud proxy) yum: - name: mod_authnz_pam - state: latest - lock_timeout : 180 - -- name: Add LoadModule line to 55-authnz_pam.conf - ansible.builtin.lineinfile: - path: /etc/httpd/conf.modules.d/55-authnz_pam.conf - search_string: 'LoadModule authnz_pam_module' - line: LoadModule authnz_pam_module modules/mod_authnz_pam.so - -- name: Set up PAM authentication - shell: | - cp /etc/pam.d/sshd /etc/pam.d/ood - chmod 640 /etc/shadow - chgrp apache /etc/shadow - args: - creates: /etc/pam.d/ood + name: mod_authnz_external,pwauth + lock_timeout: 180