From 5c7c56e598e9d381b41b91a32d9cb18d817f6951 Mon Sep 17 00:00:00 2001 From: Emelie Date: Thu, 23 Sep 2021 08:34:01 +0200 Subject: [PATCH] fix vaultwarden backups --- config/hosts/wind/configuration.nix | 2 ++ config/hosts/wind/services/restic.nix | 2 +- config/hosts/wind/services/vaultwarden.nix | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/hosts/wind/configuration.nix b/config/hosts/wind/configuration.nix index 948d4fc..98ac12c 100644 --- a/config/hosts/wind/configuration.nix +++ b/config/hosts/wind/configuration.nix @@ -12,6 +12,7 @@ ./services/gitea.nix ./services/restic.nix ./services/sshguard.nix + ./services/vaultwarden.nix ./data/secrets/secrets.nix ]; @@ -44,6 +45,7 @@ vim htop iotop + dig ]; nix = { diff --git a/config/hosts/wind/services/restic.nix b/config/hosts/wind/services/restic.nix index 5779535..d791f3f 100644 --- a/config/hosts/wind/services/restic.nix +++ b/config/hosts/wind/services/restic.nix @@ -35,7 +35,7 @@ repository = "sftp:restic@despondos.nao.sh:/etheria/backup/wind/vaultwarden"; initialize = true; pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" "--keep-yearly 75" ]; - timerConfig = { "OnCalendar" = "03:30"; }; + timerConfig = { "OnCalendar" = "23:45"; }; extraOptions = [ "sftp.command='ssh restic@despondos.nao.sh -i ${config.secrets.files.ssh_private_key.file} -s sftp'" ]; passwordFile = builtins.toString config.secrets.files.restic_pass.file; }; diff --git a/config/hosts/wind/services/vaultwarden.nix b/config/hosts/wind/services/vaultwarden.nix index 2351cf2..bb072a3 100644 --- a/config/hosts/wind/services/vaultwarden.nix +++ b/config/hosts/wind/services/vaultwarden.nix @@ -3,17 +3,16 @@ services.vaultwarden = { enable = true; environmentFile = config.secrets.files.vaultwarden_env.file; - backupDir = "/var/lib/vaultwarden/backup"; + backupDir = "/var/lib/bitwarden_rs/backup"; config = { domain = "https://vault.graven.dev"; signupsAllowed = true; rocketPort = 8812; - rocketLog = warn; ipHeader = "X-Real-IP"; websocketEnabled = true; websocketAddress = "127.0.0.1"; websocketPort = "3012"; - dataDir = "/var/lib/vaultwarden"; + #dataDir = "/var/lib/vaultwarden"; smtpHost = "smtp.soverin.net"; smtpFrom = "vaultwarden@graven.dev"; smtpFromName = "Vaultwarden";