From 9b98a2285059b43be9be6086dc0347b8bd8a9678 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sun, 12 Jul 2020 12:37:43 +0200
Subject: [PATCH] Add pgp key fetching using WKD to dbscripts role
---
roles/dbscripts/defaults/main.yml | 1 +
roles/dbscripts/tasks/main.yml | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/roles/dbscripts/defaults/main.yml b/roles/dbscripts/defaults/main.yml
index 76e0354de..fce75b3d6 100644
--- a/roles/dbscripts/defaults/main.yml
+++ b/roles/dbscripts/defaults/main.yml
@@ -1,3 +1,4 @@
---
dbscripts_commit: HEAD
dbscripts_update: yes
+dbscripts_pgp_emails: ['eschwartz@archlinux.org']
diff --git a/roles/dbscripts/tasks/main.yml b/roles/dbscripts/tasks/main.yml
index d19845d46..97e188156 100644
--- a/roles/dbscripts/tasks/main.yml
+++ b/roles/dbscripts/tasks/main.yml
@@ -69,7 +69,7 @@
- name: create staging directories in user homes
dbscripts_mkdirs:
pathtmpl: '/home/{user}/staging/{dirname}'
- permissions: 755
+ permissions: '755'
directories: ['', 'core', 'extra', 'testing', 'staging', 'community', 'community-staging', 'community-testing', 'multilib', 'multilib-staging', 'multilib-testing']
users: "{{ arch_users.keys() | list }}"
group: users
@@ -150,6 +150,12 @@
- name: add acl group:dev:rw- to /srv/ftp/lastupdate
acl: name=/srv/ftp/lastupdate entry="group:dev:rw-" state=present
+- name: fetch dbscripts PGP key
+ command: /usr/bin/gpg --keyserver keys.openpgp.org --auto-key-locate wkd,keyserver --locate-keys {{ item }}
+ with_items: '{{ dbscripts_pgp_emails }}'
+ register: gpg
+ changed_when: "gpg.rc == 0"
+
- name: clone dbscripts git repo
git: >
dest=/srv/repos/{{ item }}/dbscripts
--
GitLab