From 7a4a444da6cf0c9fcfe2e14a5c118d8367b937be Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Thu, 18 Nov 2021 00:18:54 +0100
Subject: [PATCH] Adopt nix setup and joex module

---
 nix/module-server.nix | 12 ++++++++++++
 nix/release.nix       | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/nix/module-server.nix b/nix/module-server.nix
index ca7eb013..b4eaafaa 100644
--- a/nix/module-server.nix
+++ b/nix/module-server.nix
@@ -13,6 +13,7 @@ let
     app-name = "Docspell";
     app-id = "rest1";
     base-url = "http://localhost:7880";
+    internal-url = "http://localhost:7880";
     max-item-page-size = 200;
     max-note-length = 180;
     show-classification-settings = true;
@@ -145,6 +146,17 @@ in {
         '';
       };
 
+      internal-url = mkOption {
+        type = types.str;
+        default = defaults.internal-url;
+        description = ''
+          This url is the base url for reaching this server internally.
+          While you might set `base-url` to some external address (like
+          mydocs.myserver.com), the `internal-url` must be set such that
+          other nodes can reach this server.
+        '';
+      };
+
       max-item-page-size = mkOption {
         type = types.int;
         default = defaults.max-item-page-size;
diff --git a/nix/release.nix b/nix/release.nix
index 38e16cba..fd850eed 100644
--- a/nix/release.nix
+++ b/nix/release.nix
@@ -1,5 +1,16 @@
 rec {
   cfg = {
+    v0_29_0 = rec {
+      version = "0.29.0";
+      server = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip";
+        sha256 = "0bxpn3lc8ds5bbc6g8x3jbflv57jwfchi7isiy4j96nzzrpzzxmy";
+      };
+      joex = {
+        url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip";
+        sha256 = "027s4yrhai7sk4sjkxg6l9ysf2nyqplzig9jx0bhcl7pr8bhpgcr";
+      };
+    };
     v0_28_0 = rec {
       version = "0.28.0";
       server = {
@@ -140,7 +151,7 @@ rec {
     };
   };
   pkg = v: import ./pkg.nix v;
-  currentPkg = pkg cfg.v0_28_0;
+  currentPkg = pkg cfg.v0_29_0;
   module-joex = ./module-joex.nix;
   module-restserver = ./module-server.nix;
   modules = [ module-joex