From 4b2c26265d7bf37f03949b08ade932f7e174534f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 3 Jun 2023 15:36:09 +0200
Subject: ma shiori: use new service

---
 makefu/2configs/shiori.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/shiori.nix b/makefu/2configs/shiori.nix
index cbccdc1f5..94a5e9dc8 100644
--- a/makefu/2configs/shiori.nix
+++ b/makefu/2configs/shiori.nix
@@ -4,19 +4,10 @@ let
   statedir = "/var/lib/shiori";
 in {
   state = [ "/var/lib/private/shiori" ]; # when using dynamicUser
-  systemd.services.shiori = {
-    description = "Shiori Server";
-    after = [ "network-online.target" ];
-    environment = {
-      SHIORI_DIR = statedir;
-    };
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      DynamicUser = true;
-      StateDirectory = "shiori";
-      ExecStart = "${pkgs.shiori}/bin/shiori serve -a 127.0.0.1 -p ${toString web_port}";
-      PrivateTmp = true;
-    };
+  services.shiori = {
+    enable = true;
+    port = web_port;
+    address = "127.0.0.1";
   };
   services.nginx.virtualHosts."bookmark.euer.krebsco.de" = {
     forceSSL = true;
-- 
cgit v1.2.3