From 7c2264ff893fe0e2f2f2ca506331c5918cdd6150 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Wed, 17 Nov 2021 11:54:36 +0300
Subject: [PATCH] Fix errors caused by temp files creation

---
 files.nix               | 19 +++++++++----------
 letsencrypt/acme.nix    |  2 +-
 nextcloud/nextcloud.nix |  4 ++--
 passmgr/bitwarden.nix   |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/files.nix b/files.nix
index 80981e5..5c59961 100644
--- a/files.nix
+++ b/files.nix
@@ -16,16 +16,15 @@ in
       '';
     in
     [
-      "d /var/restic 0660 restic - - -"
-      "d /var/bitwarden 0777 bitwarden_rs bitwarden_rs -"
-      "d /var/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -"
-      "d /var/lib/pleroma 0600 pleroma pleroma - -"
-      "d /var/lib/restic 0600 restic restic - -"
-      "f /var/lib/restic/pass 0400 restic restic - ${resticPassword}"
-      "f /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -"
+      (if cfg.bitwarden.enable then "d /var/lib/bitwarden 0777 bitwarden_rs bitwarden_rs -" else "")
+      (if cfg.bitwarden.enable then "d /var/lib/bitwarden/backup 0777 bitwarden_rs bitwarden_rs -" else "")
+      (if cfg.pleroma.enable then "d /var/lib/pleroma 0600 pleroma pleroma - -" else "")
+      "d /var/lib/restic 0600 restic - - -"
+      "f /var/lib/restic/pass 0400 restic - - ${resticPass}"
+      (if cfg.pleroma.enable then "f /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -" else "")
       "f /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
-      "f /var/nextcloud-db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}"
-      "f /var/nextcloud-admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}"
-      "f /var/cloudflareCredentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
+      (if cfg.nextcloud.enable then "f /var/lib/nextcloud/db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}" else "")
+      (if cfg.nextcloud.enable then "f /var/lib/nextcloud/admin-pass 0440 nextcloud nextcloud - ${nextcloudAdminPass}" else "")
+      "f /var/lib/cloudflare/Credentials.ini 0440 nginx acmerecievers - ${cloudflareCredentials}"
     ];
 }
diff --git a/letsencrypt/acme.nix b/letsencrypt/acme.nix
index d6a533d..10e5ebf 100644
--- a/letsencrypt/acme.nix
+++ b/letsencrypt/acme.nix
@@ -15,7 +15,7 @@ in
         extraDomainNames = [ "${cfg.domain}" ];
         group = "acmerecievers";
         dnsProvider = "cloudflare";
-        credentialsFile = "/var/cloudflareCredentials.ini";
+        credentialsFile = "/var/lib/cloudflare/Credentials.ini";
       };
     };
   };
diff --git a/nextcloud/nextcloud.nix b/nextcloud/nextcloud.nix
index 64d88dc..e6a9a7a 100644
--- a/nextcloud/nextcloud.nix
+++ b/nextcloud/nextcloud.nix
@@ -25,9 +25,9 @@ in
       dbuser = "nextcloud";
       dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself
       dbname = "nextcloud";
-      dbpassFile = "/var/nextcloud-db-pass";
+      dbpassFile = "/var/lib/nextcloud/db-pass";
 
-      adminpassFile = "/var/nextcloud-admin-pass";
+      adminpassFile = "/var/lib/nextcloud/admin-pass";
       adminuser = "admin";
     };
   };
diff --git a/passmgr/bitwarden.nix b/passmgr/bitwarden.nix
index 817b82a..7730458 100644
--- a/passmgr/bitwarden.nix
+++ b/passmgr/bitwarden.nix
@@ -6,7 +6,7 @@ in
   services.bitwarden_rs = {
     enable = cfg.bitwarden.enable;
     dbBackend = "sqlite";
-    backupDir = "/var/bitwarden/backup";
+    backupDir = "/var/lib/bitwarden/backup";
     config = {
       domain = "https://password.${cfg.domain}/";
       signupsAllowed = true;