From 9eefebe154a1e50873c1f0a83fb1062dc9bd4e68 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 4 Apr 2020 20:50:27 +0100 Subject: [PATCH] Simplify GPG setup for tor browser --- tasks/packages.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tasks/packages.yml b/tasks/packages.yml index d97437f..464febd 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -2,7 +2,6 @@ set_fact: keys: - '1EDDE2CDFC025D17F6DA9EC0ADAE6AD28A8F901A' # Sublime Text - - 'EF6E286DDA85EA2A4BA7DE684E2C6E8793298290' # Tor Browser - '9D5F1C051D146843CDA4858BDE64825E7CBC0D51' # ArchStrike - name: Install pacman config @@ -11,33 +10,25 @@ dest: /etc/pacman.conf mode: 0644 -- name: "Get installed pacman keys" - shell: "pacman-key --list-keys" - register: pacman_keys - -- name: "Get known GPG keys" - shell: "gpg --list-keys" - become: true - become_user: "{{ user }}" - register: known_gpg_keys - - name: "Add keys to pacman" shell: "pacman-key -r {{ item }}" - when: "item not in pacman_keys.stdout" loop: "{{ keys }}" - name: "Sign keys in pacman" shell: "pacman-key --lsign-key {{ item }}" - when: "item not in pacman_keys.stdout" loop: "{{ keys }}" - name: "Add keys to local keyring" shell: "gpg --recv-keys {{ item }}" become: true become_user: "{{ user }}" - when: "item not in known_gpg_keys.stdout" loop: "{{ keys }}" +- name: "Add tor browser key" + shell: "gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org" + become: true + become_user: "{{ user }}" + - name: Create aur_builder user user: name: aur_builder