From 59127d94524d4d6c16fd53bd0e35872b8729399c Mon Sep 17 00:00:00 2001
From: Adrian Gunnar Lauterer <adrian@lauterer.it>
Date: Thu, 23 May 2024 21:02:27 +0200
Subject: [PATCH] added shiori bookmark and archiver

---
 machines/elrond/routes.nix           | 16 +++++++++++++++-
 machines/galadriel/configuration.nix |  1 +
 services/shiori.nix                  |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 services/shiori.nix

diff --git a/machines/elrond/routes.nix b/machines/elrond/routes.nix
index 7521215..14dc751 100644
--- a/machines/elrond/routes.nix
+++ b/machines/elrond/routes.nix
@@ -61,5 +61,19 @@
         #basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
       };  
 
-   };
+    
+    #virtualHosts."shiori.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
+    #virtualHosts."pocket.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
+    #virtualHosts."bookmarks.lauterer.it" = config.services.nginx.virtualHosts."archive.lauterer.it";
+    virtualHosts."archive.lauterer.it" = {
+        forceSSL = true;
+        useACMEHost = config.networking.domain;
+        locations."/" = {
+          proxyWebsockets = true;
+          proxyPass = "http://100.84.215.84:8082";
+        };
+        #basicAuthFile = config.sops.secrets."nginx/defaultpass".path;
+      };  
+
+  };  
 }
diff --git a/machines/galadriel/configuration.nix b/machines/galadriel/configuration.nix
index a517d59..dea64af 100644
--- a/machines/galadriel/configuration.nix
+++ b/machines/galadriel/configuration.nix
@@ -23,6 +23,7 @@
       ../../services/mc.nix
       #../../services/stableDiffusion.nix
       ../../services/rss.nix
+      ../../services/shiori.nix
     ];
 
   # Bootloader.
diff --git a/services/shiori.nix b/services/shiori.nix
new file mode 100644
index 0000000..e6990f2
--- /dev/null
+++ b/services/shiori.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }:
+{
+
+  services.shiori.enable = true;
+  services.shiori.port = 8082;
+
+}