update joplin

This commit is contained in:
Dmitriy Kholkin 2022-12-07 02:38:16 +03:00
parent 7609b70840
commit 99624b1d31
2 changed files with 24 additions and 4 deletions

View File

@ -30,6 +30,14 @@ let
ln -s /gitea /backups/gitea ln -s /gitea /backups/gitea
fi 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 cd /backups
duplicacy backup duplicacy backup
''; '';

View File

@ -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-env = { };
secrets.joplin-db-env = { }; secrets.joplin-db-env = { };
@ -11,8 +16,8 @@
"--network=joplin" "--network=joplin"
]; ];
ports = [ "127.0.0.1:22300:22300" ]; ports = [ "127.0.0.1:22300:22300" ];
image = "joplin:latest-dev"; image = "ataraxiadev/joplin-server:2.8.8";
volumes = [ "/srv/joplin/data:/data" ]; volumes = [ "${joplin-data}:/home/joplin/data" ];
}; };
joplin-db = { joplin-db = {
autoStart = true; autoStart = true;
@ -24,7 +29,7 @@
volumes = [ "/srv/joplin/postgres:/var/lib/postgresql/data" ]; 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"; serviceConfig.Type = "oneshot";
wantedBy = [ wantedBy = [
"${backend}-joplin.service" "${backend}-joplin.service"
@ -36,4 +41,11 @@
exit 0 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}
'';
};
} }