From 6849e2325e17a35f4e6605f17c08fec186a56d23 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Tue, 3 May 2022 17:12:33 +0000
Subject: [PATCH] Backup: Use single repo + host key per deployment
---
.../{borgbackup/storage1.passphrase => borgbackup.passphrase} | 0
.../{borgbackup/storage1.ssh-key => borgbackup.ssh-key} | 0
morph/grid/local/private-keys/borgbackup/storage2.passphrase | 1 -
morph/grid/local/private-keys/borgbackup/storage2.ssh-key | 1 -
morph/lib/borgbackup.nix | 4 ++--
5 files changed, 2 insertions(+), 4 deletions(-)
rename morph/grid/local/private-keys/{borgbackup/storage1.passphrase => borgbackup.passphrase} (100%)
rename morph/grid/local/private-keys/{borgbackup/storage1.ssh-key => borgbackup.ssh-key} (100%)
delete mode 120000 morph/grid/local/private-keys/borgbackup/storage2.passphrase
delete mode 120000 morph/grid/local/private-keys/borgbackup/storage2.ssh-key
diff --git a/morph/grid/local/private-keys/borgbackup/storage1.passphrase b/morph/grid/local/private-keys/borgbackup.passphrase
similarity index 100%
rename from morph/grid/local/private-keys/borgbackup/storage1.passphrase
rename to morph/grid/local/private-keys/borgbackup.passphrase
diff --git a/morph/grid/local/private-keys/borgbackup/storage1.ssh-key b/morph/grid/local/private-keys/borgbackup.ssh-key
similarity index 100%
rename from morph/grid/local/private-keys/borgbackup/storage1.ssh-key
rename to morph/grid/local/private-keys/borgbackup.ssh-key
diff --git a/morph/grid/local/private-keys/borgbackup/storage2.passphrase b/morph/grid/local/private-keys/borgbackup/storage2.passphrase
deleted file mode 120000
index 013551ad..00000000
--- a/morph/grid/local/private-keys/borgbackup/storage2.passphrase
+++ /dev/null
@@ -1 +0,0 @@
-storage1.passphrase
\ No newline at end of file
diff --git a/morph/grid/local/private-keys/borgbackup/storage2.ssh-key b/morph/grid/local/private-keys/borgbackup/storage2.ssh-key
deleted file mode 120000
index 02b3a0b6..00000000
--- a/morph/grid/local/private-keys/borgbackup/storage2.ssh-key
+++ /dev/null
@@ -1 +0,0 @@
-storage1.ssh-key
\ No newline at end of file
diff --git a/morph/lib/borgbackup.nix b/morph/lib/borgbackup.nix
index 72861dca..ecc43bff 100644
--- a/morph/lib/borgbackup.nix
+++ b/morph/lib/borgbackup.nix
@@ -33,12 +33,12 @@ in {
# The passphrase is used to encrypt the repo key
# https://borgbackup.readthedocs.io/en/stable/usage/init.html
destination = "/run/keys/borgbackup/passphrase";
- source = "${privateKeyPath}/borgbackup/${config.networking.hostName}.passphrase";
+ source = "${privateKeyPath}/borgbackup.passphrase";
};
"borgbackup-appendonly-ssh-key" = {
# The ssh key is used to authenticate to the remote repo server
destination = "/run/keys/borgbackup/ssh-key";
- source = "${privateKeyPath}/borgbackup/${config.networking.hostName}.ssh-key";
+ source = "${privateKeyPath}/borgbackup.ssh-key";
};
};
};
--
GitLab