about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorGuillaume Girol <symphorien@users.noreply.github.com>2022-09-12 19:26:39 +0000
committerGitHub <noreply@github.com>2022-09-12 19:26:39 +0000
commita47cfca9afdd59ffaede44d27e34bf888e22fc93 (patch)
treeff5f3034309961a92531045fd224e3daffeb1f41 /nixos
parent730715f4293ca76aecd927242b6cd121b6c2ac66 (diff)
parent70b8ef1df6ff5a998b76d2263af2d1f4e73116ed (diff)
downloadnixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar.gz
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar.bz2
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar.lz
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar.xz
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.tar.zst
nixlib-a47cfca9afdd59ffaede44d27e34bf888e22fc93.zip
Merge pull request #189744 from symphorien/vaultwarden-service
nixos/vaultwarden: misc fixes
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/security/vaultwarden/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 7e4863dd871e..81423e57fd2c 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -197,6 +197,7 @@ in {
         AmbientCapabilities = "CAP_NET_BIND_SERVICE";
         StateDirectory = "bitwarden_rs";
         StateDirectoryMode = "0700";
+        Restart = "always";
       };
       wantedBy = [ "multi-user.target" ];
     };
@@ -209,6 +210,8 @@ in {
         BACKUP_FOLDER = cfg.backupDir;
       };
       path = with pkgs; [ sqlite ];
+      # if both services are started at the same time, vaultwarden fails with "database is locked"
+      before = [ "vaultwarden.service" ];
       serviceConfig = {
         SyslogIdentifier = "backup-vaultwarden";
         Type = "oneshot";
@@ -220,7 +223,7 @@ in {
     };
 
     systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) {
-      aliases = [ "backup-bitwarden_rs.service" ];
+      aliases = [ "backup-bitwarden_rs.timer" ];
       description = "Backup vaultwarden on time";
       timerConfig = {
         OnCalendar = mkDefault "23:00";