From bc35596bd2b01137c97b569dd5d4db8cc27959c7 Mon Sep 17 00:00:00 2001
From: Harald Sitter <sitter@kde.org>
Date: Sun, 3 Nov 2024 18:37:34 +0100
Subject: [PATCH] gpg: use more consistent key names

---
 mkosi.finalize.chroot | 2 +-
 upload.sh             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkosi.finalize.chroot b/mkosi.finalize.chroot
index f3ef4b8..a718ecb 100755
--- a/mkosi.finalize.chroot
+++ b/mkosi.finalize.chroot
@@ -14,7 +14,7 @@ KEYRING=/usr/lib/systemd/import-pubring.gpg
 rm -rf "$GNUPGHOME"
 mkdir "$GNUPGHOME"
 rm -f "$KEYRING"
-gpg --no-options --no-default-keyring --keyring="$KEYRING" --homedir="$GNUPGHOME" --import "$SRCDIR/.secure_files/gpg.key"
+gpg --no-options --no-default-keyring --keyring="$KEYRING" --homedir="$GNUPGHOME" --import "$SRCDIR/.secure_files/gpg.public.key"
 
 rm -rfv /etc/pacman.d/gnupg
 
diff --git a/upload.sh b/upload.sh
index 08f4a14..1ffb872 100755
--- a/upload.sh
+++ b/upload.sh
@@ -18,6 +18,7 @@ go -C ./upload-vacuum/ build -o upload-vacuum .
 
 # For this script only
 export GNUPGHOME="$PWD/.secure_files/gpg"
+gpg --no-options --homedir="$GNUPGHOME" --import "$SRCDIR/.secure_files/gpg.private.key"
 REMOTE=$SSH_USER@$SSH_HOST:$SSH_PATH
 echo "files.kde.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUjdH4S7otYIdLUkOZK+owIiByjNQPzGi7GQ5HOWjO6" >> ~/.ssh/known_hosts