From 462b767ac2c0cbc984bf5294a25f3618df4f7132 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Mon, 8 Nov 2021 12:12:57 +0100
Subject: [PATCH] Eschwartz resigned as TU, Staff
---
group_vars/all/archusers.yml | 6 ------
one-shots/keycloak-importer/archusers.yml | 6 ------
pubkeys/eschwartz.pub | 1 -
roles/dbscripts/defaults/main.yml | 2 +-
4 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 pubkeys/eschwartz.pub
diff --git a/group_vars/all/archusers.yml b/group_vars/all/archusers.yml
index 48982d16d..505009841 100644
--- a/group_vars/all/archusers.yml
+++ b/group_vars/all/archusers.yml
@@ -178,12 +178,6 @@ arch_users:
- dev
- multilib
- tu
- eschwartz:
- name: "Eli Schwartz"
- ssh_key: eschwartz.pub
- groups:
- - tu
- - multilib
escondida:
name: "Ivy Foster"
ssh_key: escondida.pub
diff --git a/one-shots/keycloak-importer/archusers.yml b/one-shots/keycloak-importer/archusers.yml
index b28e75528..00ea18293 100644
--- a/one-shots/keycloak-importer/archusers.yml
+++ b/one-shots/keycloak-importer/archusers.yml
@@ -191,12 +191,6 @@ arch_users:
# - dev
# - multilib
# - tu
- # eschwartz:
- # name: "Eli Schwartz"
- # ssh_key: eschwartz.pub
- # groups:
- # - tu
- # - multilib
# escondida:
# name: "Ivy Foster"
# ssh_key: escondida.pub
diff --git a/pubkeys/eschwartz.pub b/pubkeys/eschwartz.pub
deleted file mode 100644
index 7b5e226d4..000000000
--- a/pubkeys/eschwartz.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6OXMLKmaxM23AlPegGQozTxQSDDjtwHf8Ur6JRD//2eGfGp4Ej2IgSauS/0wQdWWBf0eDZeL4iFW/JQOtweyxlotbQQsB//VvAbAYUnuQh+i7VlVoCnfuL0zD0mfAvWoxhqBbxVWGHQD6bQv2YPUSlV0w8222qlg/XeQtaJ8W7Xd+Ap4jCk9uG6Pjx6bTtueHfX+ZHlGxxAyJRz1LZgL/Vu2JT7UeXBrAkPqFJoW6JFQT5lKXuGn603LM1smi6Y4YnpWJZ9Z5Q7uQL8/iqh2u02hCy8V4fbwsIovbRnTkJJSyFe7hFvu7VA1/lmh6Cb4KO7UDQ1ne0nGbfCSq8WV7 eschwartz@vostro
diff --git a/roles/dbscripts/defaults/main.yml b/roles/dbscripts/defaults/main.yml
index ad8a791d2..4d2db1674 100644
--- a/roles/dbscripts/defaults/main.yml
+++ b/roles/dbscripts/defaults/main.yml
@@ -1,4 +1,4 @@
---
dbscripts_commit: HEAD
dbscripts_update: true
-dbscripts_pgp_emails: ['eschwartz@archlinux.org', 'jelle@archlinux.org']
+dbscripts_pgp_emails: ['jelle@archlinux.org']
--
GitLab