From 19f30daf80929c9c30c3f1088679af1bfef0414b Mon Sep 17 00:00:00 2001
From: Alexander Tomokhov <alexoundos@selfprivacy.org>
Date: Fri, 22 Dec 2023 18:07:14 +0400
Subject: [PATCH] sp-modules: x-systemd.before=... for all mountpoints

---
 sp-modules/bitwarden/module.nix               |  6 ++++++
 sp-modules/nextcloud/module.nix               |  2 ++
 sp-modules/pleroma/module.nix                 |  6 +++++-
 sp-modules/simple-nixos-mailserver/config.nix | 12 ++++++++++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/sp-modules/bitwarden/module.nix b/sp-modules/bitwarden/module.nix
index d7a50cf..d225c7c 100644
--- a/sp-modules/bitwarden/module.nix
+++ b/sp-modules/bitwarden/module.nix
@@ -25,6 +25,9 @@ in
           "x-systemd.required-by=bitwarden-secrets.service"
           "x-systemd.required-by=backup-vaultwarden.service"
           "x-systemd.required-by=vaultwarden.service"
+          "x-systemd.before=bitwarden-secrets.service"
+          "x-systemd.before=backup-vaultwarden.service"
+          "x-systemd.before=vaultwarden.service"
         ];
       };
       "/var/lib/bitwarden_rs" = {
@@ -34,6 +37,9 @@ in
           "x-systemd.required-by=bitwarden-secrets.service"
           "x-systemd.required-by=backup-vaultwarden.service"
           "x-systemd.required-by=vaultwarden.service"
+          "x-systemd.before=bitwarden-secrets.service"
+          "x-systemd.before=backup-vaultwarden.service"
+          "x-systemd.before=vaultwarden.service"
         ];
       };
     };
diff --git a/sp-modules/nextcloud/module.nix b/sp-modules/nextcloud/module.nix
index 3b4a183..aa086f8 100644
--- a/sp-modules/nextcloud/module.nix
+++ b/sp-modules/nextcloud/module.nix
@@ -24,6 +24,8 @@
             "bind"
             "x-systemd.required-by=nextcloud-setup.service"
             "x-systemd.required-by=nextcloud-secrets.service"
+            "x-systemd.before=nextcloud-setup.service"
+            "x-systemd.before=nextcloud-secrets.service"
           ];
         };
       };
diff --git a/sp-modules/pleroma/module.nix b/sp-modules/pleroma/module.nix
index afb2969..3ed64ee 100644
--- a/sp-modules/pleroma/module.nix
+++ b/sp-modules/pleroma/module.nix
@@ -22,6 +22,8 @@ in
           "bind"
           "x-systemd.required-by=pleroma-secrets.service"
           "x-systemd.required-by=pleroma.service"
+          "x-systemd.before=pleroma.service"
+          "x-systemd.before=pleroma-secrets.service"
         ];
       };
       "/var/lib/postgresql" = {
@@ -30,6 +32,8 @@ in
           "bind"
           "x-systemd.required-by=pleroma-secrets.service"
           "x-systemd.required-by=pleroma.service"
+          "x-systemd.before=pleroma-secrets.service"
+          "x-systemd.before=pleroma.service"
         ];
       };
     };
@@ -78,7 +82,7 @@ in
 
         install -C -m 0700 -o pleroma -g pleroma -d /var/lib/pleroma
 
-        install -C -m 0700 -o pleroma -g pleroma -DT \
+        install -C -m 0600 -o pleroma -g pleroma -DT \
         <(printf "%s" "$filecontents") ${secrets-exs}
       '';
     };
diff --git a/sp-modules/simple-nixos-mailserver/config.nix b/sp-modules/simple-nixos-mailserver/config.nix
index bbdcf97..ea2d6ca 100644
--- a/sp-modules/simple-nixos-mailserver/config.nix
+++ b/sp-modules/simple-nixos-mailserver/config.nix
@@ -9,12 +9,20 @@ lib.mkIf sp.modules.simple-nixos-mailserver.enable
       "/var/vmail" = {
         device =
           "/volumes/${sp.modules.simple-nixos-mailserver.location}/vmail";
-        options = [ "bind" ];
+        options = [
+          "bind"
+          "x-systemd.required-by=postfix.service"
+          "x-systemd.before=postfix.service"
+        ];
       };
       "/var/sieve" = {
         device =
           "/volumes/${sp.modules.simple-nixos-mailserver.location}/sieve";
-        options = [ "bind" ];
+        options = [
+          "bind"
+          "x-systemd.required-by=dovecot2.service"
+          "x-systemd.before=dovecot2.service"
+        ];
       };
     };