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 013551ada22759642650a38195a810297bf9a5ff..0000000000000000000000000000000000000000 --- 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 02b3a0b60d55b65ced18ef7d6703e4479cd3646f..0000000000000000000000000000000000000000 --- 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 72861dca8926dc4baeff1a923bf1624e45cec646..ecc43bff377098acbd8ee133d7a2d2608a126bcb 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"; }; }; };