diff --git a/playbooks/roles/common/tasks/main.yml b/playbooks/roles/common/tasks/main.yml index 340892af8e3..9f3602627d0 100644 --- a/playbooks/roles/common/tasks/main.yml +++ b/playbooks/roles/common/tasks/main.yml @@ -52,33 +52,6 @@ when: ansible_distribution in common_debian_variants -# Ensure that we can install old software if need be. -- name: Add edX PPA apt key - apt_key: - id: "{{ COMMON_EDX_PPA_KEY_ID }}" - keyserver: "{{ COMMON_EDX_PPA_KEY_SERVER }}" - state: "present" - when: > - ansible_distribution in common_debian_variants and - ansible_distribution_release != 'bionic' - -- name: Update expired apt keys - shell: apt-key adv --recv-keys --keyserver {{ COMMON_EDX_PPA_KEY_SERVER }} {{ COMMON_EDX_PPA_KEY_ID }} - when: > - ansible_distribution in common_debian_variants and - ansible_distribution_release != 'bionic' - - -- name: Add custom edX PPA - # Ensure that we get the latest version of python 2.7 - # MySQL 5.6 is from our own PPA: https://bugs.mysql.com/bug.php?id=84848 - apt_repository: - repo: "{{ COMMON_EDX_PPA }}" - when: > - ansible_distribution in common_debian_variants and - ansible_distribution_release != 'bionic' - - - name: Install role-independent useful system packages # do this before log dir setup; rsyslog package guarantees syslog user present apt: diff --git a/playbooks/roles/server_utils/tasks/main.yml b/playbooks/roles/server_utils/tasks/main.yml index 73f28b0a862..9a6fe819c6e 100644 --- a/playbooks/roles/server_utils/tasks/main.yml +++ b/playbooks/roles/server_utils/tasks/main.yml @@ -21,15 +21,10 @@ # # -- name: Check for expired edx key - command: "apt-key list | grep {{ SERVER_UTILS_EDX_PPA_KEY_ID }}" - register: ppa_key_status +- name: Remove old edx ppa and key + shell: "sudo apt-key del {{ SERVER_UTILS_EDX_PPA_KEY_ID }} && sudo rm -rf /etc/apt/sources.list.d/ppa_edx_org.list" when: ansible_distribution in common_debian_variants -- name: remove expired edx key - command: "sudo apt-key adv --keyserver {{ SERVER_UTILS_EDX_PPA_KEY_SERVER }} --recv-keys {{ SERVER_UTILS_EDX_PPA_KEY_ID }}" - when: ansible_distribution in common_debian_variants and 'expired' in ppa_key_status.stdout - - name: Install ubuntu system packages apt: name: "{{ item }}"