Skip to content

fix: remove edx ppa #2

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.

Sign up for GitHub

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

Open
DonatoBD wants to merge 1 commit into
base: open-release/ironwood.ednx
Choose a base branch
from
Open

fix: remove edx ppa #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions playbooks/roles/common/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 2 additions & 7 deletions playbooks/roles/server_utils/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down