From d4982d6b72565352b04ce0eb4cd6ce6caa52232a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 17 Feb 2022 17:44:07 +0100
Subject: vidhar: ...

---
 hosts/vidhar/borg/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'hosts/vidhar/borg/default.nix')

diff --git a/hosts/vidhar/borg/default.nix b/hosts/vidhar/borg/default.nix
index 7250c4c7..352ce887 100644
--- a/hosts/vidhar/borg/default.nix
+++ b/hosts/vidhar/borg/default.nix
@@ -11,7 +11,7 @@ let
       Host yggdrasil.borgbase
         HostName nx69hpl8.repo.borgbase.com
         User nx69hpl8
-        IdentityFile ${config.sops.secrets."append.borgbase".path}
+        IdentityFile /run/credentials/${serviceName}.service/ssh-identity
         IdentitiesOnly yes
 
         BatchMode yes
@@ -33,9 +33,13 @@ let
         "BORG_CACHE_DIR=/var/lib/borg/cache"
         "BORG_SECURITY_DIR=/var/lib/borg/security"
         "BORG_KEYS_DIR=/var/lib/borg/keys"
-        "BORG_KEY_FILE=${config.sops.secrets."yggdrasil.borgkey".path}"
+        "BORG_KEY_FILE=/run/credentials/${serviceName}.service/keyfile"
         "BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=yes"
       ];
+      LoadCredential = [
+        "ssh-identity:${config.sops.secrets."append.borgbase".path}"
+        "keyfile:${config.sops.secrets."yggdrasil.borgkey".path}"
+      ];
     };
   };
 
-- 
cgit v1.2.3