From 4d380ff601d5e30a37730a0b369fff46e239dd82 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 22 Jan 2023 14:15:15 +0100 Subject: [PATCH] fix gs backup --- nixos/gorgon/configuration.nix | 8 ++++---- nixos/modules/backup.nix | 2 ++ nixos/modules/profiles/backup.nix | 6 ++++++ secrets/gorgon-backup-gs-passphrase.age | 10 ++++++++++ secrets/secrets.nix | 1 + 5 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 secrets/gorgon-backup-gs-passphrase.age diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 8e2461f..34da64e 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -99,12 +99,12 @@ in 21027 # Syncthing ]; }; - + systemd.services.modem-manager.enable = lib.mkForce false; systemd.services."dbus-org.freedesktop.ModemManager1".enable = lib.mkForce false; - - services.udev.packages= [ xilinxJtag ];#noMtpUdevRules ]; - + + services.udev.packages = [ xilinxJtag ]; #noMtpUdevRules ]; + virtualisation.libvirtd.enable = true; users.users = { diff --git a/nixos/modules/backup.nix b/nixos/modules/backup.nix index 198651c..06cf81d 100644 --- a/nixos/modules/backup.nix +++ b/nixos/modules/backup.nix @@ -88,6 +88,8 @@ in startAt = "monthly"; }; + systemd.timers."borgbackup-job-gs".enable = false; + services.borgbackup.jobs.bs = mkIf cfg.bs.enable { paths = "/"; exclude = backupExcludes; diff --git a/nixos/modules/profiles/backup.nix b/nixos/modules/profiles/backup.nix index 88dfab5..dc57f96 100644 --- a/nixos/modules/profiles/backup.nix +++ b/nixos/modules/profiles/backup.nix @@ -9,6 +9,12 @@ in sshIdentityFile = config.age.secrets."${config.networking.hostName}-backup-ssh-key".path; }; + dadada.backupClient.gs = { + enable = true; + passphrasePath = config.age.secrets."${config.networking.hostName}-backup-passphrase-gs".path; + }; + age.secrets."${config.networking.hostName}-backup-passphrase".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase.age"; + age.secrets."${config.networking.hostName}-backup-passphrase-gs".file = "${secretsPath}/${config.networking.hostName}-backup-passphrase-gs.age"; age.secrets."${config.networking.hostName}-backup-ssh-key".file = "${secretsPath}/${config.networking.hostName}-backup-ssh-key.age"; } diff --git a/secrets/gorgon-backup-gs-passphrase.age b/secrets/gorgon-backup-gs-passphrase.age new file mode 100644 index 0000000..56e974e --- /dev/null +++ b/secrets/gorgon-backup-gs-passphrase.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 0aOabg 9911l+glO4IHD+/KEqVMfJHNHAxP/iShTVpGHgKC/TY +9g7vLb+T2079yst1ZKXKlwAVhF9zQd79vl/UWpnBJq8 +-> ssh-ed25519 Otklkw egRNXEFrQMSJ5rZTM4ND5LgJjkIW66YKtCeWQ1rkNTE +YQViNMFpP/S3Tpc1yvIHIWud7QHTnO0RK3FQbPlQ8N4 +-> xV2q-grease +2HGDr4IOqMcYh5ud219N73Gq8lyOWX4irrjCnNe1CR8dpjWN+rnDnCFbEB3Troqp +4zVnSNw +--- dPWJpPMiJkxAA+H8HmahTdMCGa5HaglmYmgUzhctgUo +@ÌB¾t]šøzïï‘øy*}ˆ‰§îþõ-A’¾×ÁPbÈvÙØhúnŠß =`-Âà4Ò \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b236900..7650525 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -18,6 +18,7 @@ in "pruflas-wg-hydra-key.age".publicKeys = [ systems.pruflas dadada ]; "hydra-github-authorization.age".publicKeys = [ systems.pruflas dadada ]; "miniflux-admin-credentials.age".publicKeys = [ systems.surgat dadada ]; + "gorgon-backup-gs-passphrase.age".publicKeys = [ systems.gorgon dadada ]; } // backupSecrets "gorgon" // backupSecrets "ifrit" //