From aa5d9ebbfa7deca9a9a12bb2c981dff1bd8fa547 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Mon, 6 Jun 2022 16:40:56 +0200
Subject: [PATCH] gluebuddy: allow jelle to release and allow le bots
---
roles/gluebuddy/defaults/main.yml | 6 ++++++
roles/gluebuddy/files/gluebuddy_download.sh | 3 ++-
roles/gluebuddy/templates/gluebuddy.conf.j2 | 1 +
3 files changed, 9 insertions(+), 1 deletion(-)
create mode 100644 roles/gluebuddy/defaults/main.yml
diff --git a/roles/gluebuddy/defaults/main.yml b/roles/gluebuddy/defaults/main.yml
new file mode 100644
index 000000000..a6e4cdb6a
--- /dev/null
+++ b/roles/gluebuddy/defaults/main.yml
@@ -0,0 +1,6 @@
+gitlab_bots:
+ - renovate
+ - project_10185_bot2
+ - project_19591_bot
+ - project_19796_bot
+ - project_10177_bot
diff --git a/roles/gluebuddy/files/gluebuddy_download.sh b/roles/gluebuddy/files/gluebuddy_download.sh
index 6d16b92e3..57cde31a9 100755
--- a/roles/gluebuddy/files/gluebuddy_download.sh
+++ b/roles/gluebuddy/files/gluebuddy_download.sh
@@ -31,7 +31,8 @@ do
curl -O $i
done
-sq verify --signer-cert <(sq wkd get anthraxx@archlinux.org) --detached ${NAME}.sig ${NAME}
+sq verify --signer-cert <(sq wkd get anthraxx@archlinux.org) --detached ${NAME}.sig ${NAME} || \
+ sq verify --signer-cert <(sq wkd get jelle@archlinux.org) --detached ${NAME}.sig ${NAME}
mv ${NAME} /usr/local/bin/${NAME}
chmod +x /usr/local/bin/${NAME}
diff --git a/roles/gluebuddy/templates/gluebuddy.conf.j2 b/roles/gluebuddy/templates/gluebuddy.conf.j2
index 3305234a7..2407a3957 100644
--- a/roles/gluebuddy/templates/gluebuddy.conf.j2
+++ b/roles/gluebuddy/templates/gluebuddy.conf.j2
@@ -3,3 +3,4 @@ GLUEBUDDY_KEYCLOAK_USERNAME=gluebuddy
GLUEBUDDY_KEYCLOAK_PASSWORD={{ vault_keycloak_gluebuddy_openid_client_secret }}
GLUEBUDDY_KEYCLOAK_REALM=archlinux
GLUEBUDDY_KEYCLOAK_URL=https://accounts.archlinux.org
+GLUEBUDDY_GITLAB_BOT_USERS={{ gitlab_bots|join(',') }}
--
GitLab