From 549ee33a456b47eea47cfe6dd54c36b59d4bb0b8 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Wed, 9 Nov 2022 18:30:33 +0100
Subject: [PATCH] Move rss-bridge to ttrss

---
 systems/proxy/default.nix | 17 +----------------
 systems/ttrss/default.nix | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/systems/proxy/default.nix b/systems/proxy/default.nix
index 61c171a..188809a 100644
--- a/systems/proxy/default.nix
+++ b/systems/proxy/default.nix
@@ -15,7 +15,6 @@
     "${custom.inputs.self}/modules/grav"
     "${custom.inputs.self}/modules/haproxy"
     "${custom.inputs.self}/modules/heimdall"
-    "${custom.inputs.self}/modules/rss-bridge"
   ];
 
   services.nginx = {
@@ -59,25 +58,11 @@
         };
       };
       "heimdall.2li.ch" = {
-        enableACME = true;
-        forceSSL = true;
-        listen = [{
-          port = 4433;
-          addr = "
-        127.0.0.1";
-          ssl = true;
-        }];
-        locations."/" = {
-          proxyPass = "http://127.0.0.1:8081";
-          proxyWebsockets = true; # needed if you need to use WebSocket
-        };
-      };
-      "rss-bridge.2li.ch" = {
         enableACME = true;
         forceSSL = true;
         listen = [{ port = 4433; addr = "127.0.0.1"; ssl = true; }];
         locations."/" = {
-          proxyPass = "http://127.0.0.1:8082";
+          proxyPass = "http://127.0.0.1:8081";
           proxyWebsockets = true; # needed if you need to use WebSocket
         };
       };
diff --git a/systems/ttrss/default.nix b/systems/ttrss/default.nix
index a2682df..66af88a 100644
--- a/systems/ttrss/default.nix
+++ b/systems/ttrss/default.nix
@@ -8,8 +8,22 @@ in
       ip = "10.7.89.115";
       inherit custom hostname;
     })
-    (import "${custom.inputs.self}/modules/nginx-proxy" { inherit custom domain; })
-    (import "${custom.inputs.self}/modules/ttrss-postgres" { inherit custom domain; })
     (import "${custom.inputs.self}/modules/docker" { inherit custom; })
+    (import "${custom.inputs.self}/modules/nginx-proxy" { inherit custom domain; })
+    "${custom.inputs.self}/modules/rss-bridge"
+    (import "${custom.inputs.self}/modules/ttrss-postgres" { inherit custom domain; })
   ];
+  services.nginx = {
+    virtualHosts = {
+      "rss-bridge.2li.ch" = {
+        enableACME = true;
+        forceSSL = true;
+        listen = [{ port = 4433; addr = "127.0.0.1"; ssl = true; }];
+        locations."/" = {
+          proxyPass = "http://127.0.0.1:8082";
+          proxyWebsockets = true; # needed if you need to use WebSocket
+        };
+      };
+    };
+  };
 }