From 13a4bddf0d453d56466588bf3b2f508ff80229c2 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Wed, 27 Dec 2023 20:13:05 +0100
Subject: [PATCH] pubkeys/heftig: Add my new Nitrokey, reorganize
---
group_vars/all/archusers.yml | 8 ++++++--
pubkeys/{heftig_dragon.pub => heftig_build.pub} | 0
pubkeys/heftig_nitrokey.pub | 1 +
pubkeys/{heftig.pub => heftig_yubikey.pub} | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
rename pubkeys/{heftig_dragon.pub => heftig_build.pub} (100%)
create mode 100644 pubkeys/heftig_nitrokey.pub
rename pubkeys/{heftig.pub => heftig_yubikey.pub} (64%)
diff --git a/group_vars/all/archusers.yml b/group_vars/all/archusers.yml
index 56710b292..c519e1969 100644
--- a/group_vars/all/archusers.yml
+++ b/group_vars/all/archusers.yml
@@ -418,9 +418,13 @@ arch_users:
heftig:
name: "Jan Steffens"
email: "heftig@archlinux.org"
- ssh_key: heftig.pub
+ ssh_key: heftig_nitrokey.pub
additional_ssh_keys:
- - name: heftig_dragon.pub
+ - name: heftig_yubikey.pub
+ hosts:
+ - all
+ # Used to publish nightly packages
+ - name: heftig_build.pub
hosts:
- homedir.archlinux.org
groups:
diff --git a/pubkeys/heftig_dragon.pub b/pubkeys/heftig_build.pub
similarity index 100%
rename from pubkeys/heftig_dragon.pub
rename to pubkeys/heftig_build.pub
diff --git a/pubkeys/heftig_nitrokey.pub b/pubkeys/heftig_nitrokey.pub
new file mode 100644
index 000000000..b6c3e5461
--- /dev/null
+++ b/pubkeys/heftig_nitrokey.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJLyG2MHXtzhaqAMukDjvQT8BTQpZfLYEOogJkDJDo7V cardno:000F_8991A69D
diff --git a/pubkeys/heftig.pub b/pubkeys/heftig_yubikey.pub
similarity index 64%
rename from pubkeys/heftig.pub
rename to pubkeys/heftig_yubikey.pub
index c7aa49c07..c906c0cb2 100644
--- a/pubkeys/heftig.pub
+++ b/pubkeys/heftig_yubikey.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNbRKSVPySqXMjiyxYXhhusHw7a1pokxZ2paLiEQ7Ex heftig-ed25519
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGNbRKSVPySqXMjiyxYXhhusHw7a1pokxZ2paLiEQ7Ex cardno:13_062_363
--
GitLab