From 257b0c08e8fd12f2ffc4141f0af9c4b60391884a Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@selfprivacy.org>
Date: Mon, 18 Dec 2023 22:16:40 +0400
Subject: [PATCH] sp-modules: some startup fixes

---
 sp-modules/bitwarden/module.nix | 6 ++++--
 sp-modules/pleroma/module.nix   | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sp-modules/bitwarden/module.nix b/sp-modules/bitwarden/module.nix
index f7bf090..a6ad83f 100644
--- a/sp-modules/bitwarden/module.nix
+++ b/sp-modules/bitwarden/module.nix
@@ -23,6 +23,7 @@ in
         options = [
           "bind"
           "x-systemd.required-by=bitwarden-secrets.service"
+          "x-systemd.required-by=backup-vaultwarden.service"
           "x-systemd.required-by=vaultwarden.service"
         ];
       };
@@ -31,6 +32,7 @@ in
         options = [
           "bind"
           "x-systemd.required-by=bitwarden-secrets.service"
+          "x-systemd.required-by=backup-vaultwarden.service"
           "x-systemd.required-by=vaultwarden.service"
         ];
       };
@@ -47,8 +49,8 @@ in
       };
     };
     systemd.services.bitwarden-secrets = {
-      before = [ "vaultwarden.service" ];
-      requiredBy = [ "vaultwarden.service" ];
+      before = [ "backup-vaultwarden.service" "vaultwarden.service" ];
+      requiredBy = [ "backup-vaultwarden.service" "vaultwarden.service" ];
       serviceConfig.Type = "oneshot";
       path = with pkgs; [ coreutils jq ];
       script = ''
diff --git a/sp-modules/pleroma/module.nix b/sp-modules/pleroma/module.nix
index 6be1d95..4e80b22 100644
--- a/sp-modules/pleroma/module.nix
+++ b/sp-modules/pleroma/module.nix
@@ -55,9 +55,7 @@ in
         ensureUsers = [
           {
             name = "pleroma";
-            ensurePermissions = {
-              "DATABASE pleroma" = "ALL PRIVILEGES";
-            };
+            ensureDBOwnership = true;
           }
         ];
       };