From 1ba17b61e7c955579c2317c85ea42a989c095c75 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Thu, 2 Dec 2021 18:16:16 +0300
Subject: [PATCH] Update API to properly support b2

---
 api/api-module.nix | 7 +++++++
 api/api.nix        | 1 +
 files.nix          | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/api-module.nix b/api/api-module.nix
index 6b01d37..bd65ad6 100644
--- a/api/api-module.nix
+++ b/api/api-module.nix
@@ -43,6 +43,12 @@ in
         B2 account key
       '';
     };
+    b2Bucket = mkOption {
+      type = types.str;
+      description = ''
+        B2 bucket
+      '';
+    };
     resticPassword = mkOption {
       type = types.str;
       description = ''
@@ -62,6 +68,7 @@ in
         ENABLE_SWAGGER = (if cfg.enableSwagger then "1" else "0");
         B2_ACCOUNT_ID = cfg.b2AccountId;
         B2_ACCOUNT_KEY = cfg.b2AccountKey;
+        B2_BUCKET = cfg.b2Bucket;
         RESTIC_PASSWORD = cfg.resticPassword;
       } // config.networking.proxy.envVars;
       path = [ "/var/" "/var/dkim/" pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild pkgs.restic pkgs.mkpasswd ];
diff --git a/api/api.nix b/api/api.nix
index e503220..ff9c106 100644
--- a/api/api.nix
+++ b/api/api.nix
@@ -6,6 +6,7 @@
     enableSwagger = config.services.userdata.api.enableSwagger;
     b2AccountId = config.services.userdata.backblaze.accountId;
     b2AccountKey = config.services.userdata.backblaze.accountKey;
+    b2Bucket = config.services.userdata.backblaze.bucket;
     resticPassword = config.services.userdata.resticPassword;
   };
 
diff --git a/files.nix b/files.nix
index 238e29d..ee15e52 100644
--- a/files.nix
+++ b/files.nix
@@ -27,7 +27,7 @@ in
       (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}"
-      "f /root/.config/rclone.conf 0400 root root - ${rcloneConfig}"
+      "f /root/.config/rclone/rclone.conf 0400 root root - ${rcloneConfig}"
       (if cfg.pleroma.enable then "f /var/lib/pleroma/secrets.exs 0755 pleroma pleroma - -" else "")
       "f /var/domain 0444 selfprivacy-api selfprivacy-api - ${domain}"
       (if cfg.nextcloud.enable then "f /var/lib/nextcloud/db-pass 0440 nextcloud nextcloud - ${nextcloudDBPass}" else "")