From 2fc3d05ae2789fcf3d8a2316ee61a2c54c5b4282 Mon Sep 17 00:00:00 2001 From: melhindi Date: Fri, 30 Sep 2022 16:21:15 +0200 Subject: [PATCH 1/3] Support installation on Ubuntu 22.04 Fix addition of gpg key Fix adding repository while specifying signing key Instructions based on https://brave.com/linux/ --- README.md | 7 +++++-- defaults/main.yml | 7 +++++-- tasks/install_debian.yml | 14 ++++++++------ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 390e5d8..d94da23 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,11 @@ bravebrowser_app: brave-browser bravebrowser_app_desired_state: present # Debian family based -bravebrowser_repo_debian_gpg_key: https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg -bravebrowser_repo_debian: "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" +bravebrowser_repo_debian_url: "https://brave-browser-apt-release.s3.brave.com" +bravebrowser_repo_debian_gpg_key: brave-browser-archive-keyring.gpg +bravebrowser_repo_debian_gpg_key_url: "{{ bravebrowser_repo_debian_url }}/{{ bravebrowser_repo_debian_gpg_key }}" +bravebrowser_repo_debian_gpg_key_dest: "/usr/share/keyrings/{{ bravebrowser_repo_debian_gpg_key }}" +bravebrowser_repo_debian: "deb [signed-by={{ bravebrowser_repo_debian_gpg_key_dest }} arch=amd64] {{ bravebrowser_repo_debian_url }} stable main" bravebrowser_repo_debian_filename: "{{ bravebrowser_app }}" bravebrowser_repo_debian_desired_state: present diff --git a/defaults/main.yml b/defaults/main.yml index a9417db..56cc9fe 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,8 +5,11 @@ bravebrowser_app: brave-browser bravebrowser_app_desired_state: present # Debian family based -bravebrowser_repo_debian_gpg_key: https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg -bravebrowser_repo_debian: "deb [arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" +bravebrowser_repo_debian_url: "https://brave-browser-apt-release.s3.brave.com" +bravebrowser_repo_debian_gpg_key: brave-browser-archive-keyring.gpg +bravebrowser_repo_debian_gpg_key_url: "{{ bravebrowser_repo_debian_url }}/{{ bravebrowser_repo_debian_gpg_key }}" +bravebrowser_repo_debian_gpg_key_dest: "/usr/share/keyrings/{{ bravebrowser_repo_debian_gpg_key }}" +bravebrowser_repo_debian: "deb [signed-by={{ bravebrowser_repo_debian_gpg_key_dest }} arch=amd64] {{ bravebrowser_repo_debian_url }} stable main" bravebrowser_repo_debian_filename: "{{ bravebrowser_app }}" bravebrowser_repo_debian_desired_state: present diff --git a/tasks/install_debian.yml b/tasks/install_debian.yml index 6a232ad..ba55f5f 100644 --- a/tasks/install_debian.yml +++ b/tasks/install_debian.yml @@ -2,19 +2,21 @@ # tasks file for bravebrowser - Debian/Ubuntu family - name: Debian/Ubuntu Family | Add gpg signing key for {{ bravebrowser_app }} - apt_key: - url: "{{ bravebrowser_repo_debian_gpg_key }}" - state: present + ansible.builtin.get_url: + url: "{{ bravebrowser_repo_debian_gpg_key_url }}" + dest: "{{ bravebrowser_repo_debian_gpg_key_dest }}" + mode: "0644" + become: true -- name: Debian/Ubuntu Family | Adding repository "{{ bravebrowser_repo_debian }}" - apt_repository: +- name: "Debian/Ubuntu Family | Adding repository {{ bravebrowser_repo_debian }}" + ansible.builtin.apt_repository: repo: "{{ bravebrowser_repo_debian }}" state: "{{ bravebrowser_repo_debian_desired_state }}" filename: "{{ bravebrowser_repo_debian_filename }}" update_cache: yes - name: Debian/Ubuntu Family | Installing {{ bravebrowser_app }} - apt: + ansible.builtin.apt: name: "{{ bravebrowser_app }}" state: "{{ bravebrowser_app_desired_state }}" force_apt_get: yes From 8872d715cb081afda52109299c3878df3a4213fc Mon Sep 17 00:00:00 2001 From: melhindi Date: Fri, 30 Sep 2022 17:08:55 +0200 Subject: [PATCH 2/3] Use become for apt commands --- tasks/install_debian.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/install_debian.yml b/tasks/install_debian.yml index ba55f5f..b111595 100644 --- a/tasks/install_debian.yml +++ b/tasks/install_debian.yml @@ -14,6 +14,7 @@ state: "{{ bravebrowser_repo_debian_desired_state }}" filename: "{{ bravebrowser_repo_debian_filename }}" update_cache: yes + become: true - name: Debian/Ubuntu Family | Installing {{ bravebrowser_app }} ansible.builtin.apt: @@ -21,3 +22,4 @@ state: "{{ bravebrowser_app_desired_state }}" force_apt_get: yes update_cache: yes + become: true From f30fbb27608ea50a723cd4086a9a87407485b105 Mon Sep 17 00:00:00 2001 From: melhindi Date: Fri, 30 Sep 2022 23:08:57 +0200 Subject: [PATCH 3/3] Add role metadata and github action for jammy --- .github/workflows/build-and-test.yml | 2 +- meta/main.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 441037f..7c34150 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -49,7 +49,7 @@ jobs: strategy: max-parallel: 6 matrix: - IMAGE: [ubuntu-20.04, ubuntu-18.04, rockylinux-8, debian-buster, debian-stretch] + IMAGE: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, debian-buster, debian-stretch] steps: diff --git a/meta/main.yml b/meta/main.yml index a06cd94..d835a1b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: versions: - bionic - focal + - jammy - name: Debian versions: - buster