Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove older distros #12

Merged
merged 2 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ galaxy_info:
platforms:
- name: EL
versions:
- 7
- 8
- 9
- name: Ubuntu
versions:
- bionic
- focal
- jammy
- name: Debian
versions:
- stretch
- buster
- bullseye
- bookworm
47 changes: 0 additions & 47 deletions tasks/CentOS.yml

This file was deleted.

36 changes: 4 additions & 32 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,11 @@
- name: Install oidc-agent-cli
package:
name: oidc-agent-cli
ignore_errors: true

- block:

- name: Download pip installer
get_url:
url: https://bootstrap.pypa.io/get-pip.py
dest: /opt/get-pip.py

- name: Install pip
command:
cmd: python3.8 /opt/get-pip.py
creates: /usr/local/bin/pip3.8

- name: Install python-setuptools
package:
name: python-setuptools

when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "18"
# xref: https://github.com/geerlingguy/ansible-role-pip/
- name: Install pip
package:
name: python3-pip

- name: Install PyYAML
pip:
Expand All @@ -50,13 +36,6 @@
name: contextualise_ssh_server
executable: pip3

- name: Enable contextualise_ssh_server in CentOS 7
file:
src: /opt/rh/rh-python38/root/usr/local/bin/contextualise_ssh_server
dest: /usr/bin/contextualise_ssh_server
state: link
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"

- name: Enable OIDC in PAM
lineinfile:
path: /etc/pam.d/sshd
Expand All @@ -81,13 +60,6 @@
command_env: "{{ command_env | combine ({ 'SSH_AUTHORISE_VOS' : ['urn:mace:egi.eu:group:{{ssh_oidc_other_vos}}:role=member#aai.egi.eu'] }) }}"
when: ssh_oidc_other_vos != ''

- name: Use python3.8 in Ubuntu 18.08
lineinfile:
path: /usr/local/bin/contextualise_ssh_server
regexp: '^#!/usr/bin/python3'
line: '#!/usr/bin/python3.8'
when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "18"

- name: Set access token with IM for contextualise_ssh_server
set_fact:
OIDC_ACCESS_TOKEN: "{{ IM_INFRASTRUCTURE_AUTH }}"
Expand Down
Loading