From 99624b1d31a83d4ee560160d1fc77d4de1ce8e6a Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <AlukardBF@users.noreply.github.com>
Date: Wed, 7 Dec 2022 02:38:16 +0300
Subject: [PATCH] update joplin

---
 profiles/servers/duplicacy.nix     |  8 ++++++++
 profiles/servers/joplin-server.nix | 20 ++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/profiles/servers/duplicacy.nix b/profiles/servers/duplicacy.nix
index b91c29c..3b53d10 100644
--- a/profiles/servers/duplicacy.nix
+++ b/profiles/servers/duplicacy.nix
@@ -30,6 +30,14 @@ let
       ln -s /gitea /backups/gitea
     fi
 
+    if [ ! -L "/backups/srv" ]; then
+      mkdir -p /backups/var
+    fi
+
+    if [ ! -L "/backups/srv/joplin" ]; then
+      ln -s /srv/joplin /backups/srv/joplin
+    fi
+
     cd /backups
     duplicacy backup
   '';
diff --git a/profiles/servers/joplin-server.nix b/profiles/servers/joplin-server.nix
index 1a116f6..b857e73 100644
--- a/profiles/servers/joplin-server.nix
+++ b/profiles/servers/joplin-server.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, ... }:
+let
+  joplin-data = "/srv/joplin/data";
+  joplin-uid = "1001";
+  backend = config.virtualisation.oci-containers.backend;
+in {
   secrets.joplin-env = { };
   secrets.joplin-db-env = { };
 
@@ -11,8 +16,8 @@
         "--network=joplin"
       ];
       ports = [ "127.0.0.1:22300:22300" ];
-      image = "joplin:latest-dev";
-      volumes = [ "/srv/joplin/data:/data" ];
+      image = "ataraxiadev/joplin-server:2.8.8";
+      volumes = [ "${joplin-data}:/home/joplin/data" ];
     };
     joplin-db = {
       autoStart = true;
@@ -24,7 +29,7 @@
       volumes = [ "/srv/joplin/postgres:/var/lib/postgresql/data" ];
     };
   };
-  systemd.services.create-joplin-network = with config.virtualisation.oci-containers; {
+  systemd.services.create-joplin-network = {
     serviceConfig.Type = "oneshot";
     wantedBy = [
       "${backend}-joplin.service"
@@ -36,4 +41,11 @@
       exit 0
     '';
   };
+  systemd.services.create-joplin-folder = {
+    serviceConfig.Type = "oneshot";
+    wantedBy = [ "${backend}-joplin.service" ];
+    script = ''
+      [ ! -d "${joplin-data}" ] && mkdir -p ${joplin-data} && chown ${joplin-uid} ${joplin-data}
+    '';
+  };
 }
\ No newline at end of file