From 55f0957ac7b91d3fc065cccb245bcb5f44debf7b Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 2 Jan 2024 10:01:30 -0700
Subject: [PATCH] h: disable wallabag, bookmarks to shiori

---
 hosts/h/default.nix | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/hosts/h/default.nix b/hosts/h/default.nix
index c7d73f4..3237e84 100644
--- a/hosts/h/default.nix
+++ b/hosts/h/default.nix
@@ -154,11 +154,11 @@ in
       owner = "root";
       sopsFile = config.xin-secrets.h.services;
     };
-    wallabag_secret = {
-      mode = "400";
-      owner = "wallabag";
-      sopsFile = config.xin-secrets.h.services;
-    };
+    #wallabag_secret = {
+    #  mode = "400";
+    #  owner = "wallabag";
+    #  sopsFile = config.xin-secrets.h.services;
+    #};
   };
 
   networking = {
@@ -305,7 +305,7 @@ in
 
   services = {
     wallabag = {
-      enable = true;
+      enable = false;
       secretPath = config.sops.secrets.wallabag_secret.path;
       domain = "bookmarks.tapenet.org";
     };
@@ -320,7 +320,7 @@ in
     shiori = {
       enable = true;
       port = 8967;
-      address = "100.83.77.133";
+      address = "127.0.0.1";
       package = inputs.unstable.legacyPackages.${pkgs.system}.shiori;
     };
     veilid-server = {
@@ -581,6 +581,19 @@ in
           };
         };
 
+        "bookmarks.tapenet.org" = {
+          forceSSL = true;
+          enableACME = true;
+
+          locations = {
+            "/" = {
+              proxyPass = "http://${config.services.shiori.address}:${toString config.services.shiori.port}";
+              proxyWebsockets = true;
+              priority = 1000;
+            };
+          };
+        };
+
         "git.tapenet.org" = {
           forceSSL = true;
           enableACME = true;