From ed2f7e5773a3df4e81f1259fdef2e3f6daf5e6b6 Mon Sep 17 00:00:00 2001 From: sid Date: Tue, 5 May 2026 22:35:46 +0200 Subject: [PATCH] rss stuff back on rx4 --- hosts/rx4/services/default.nix | 2 ++ hosts/{sid => rx4}/services/rss-bridge.nix | 2 +- hosts/{sid => rx4}/services/rsshub-oci.nix | 5 ----- hosts/sid/services/default.nix | 2 -- hosts/sid/services/nginx.nix | 12 ++++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) rename hosts/{sid => rx4}/services/rss-bridge.nix (92%) rename hosts/{sid => rx4}/services/rsshub-oci.nix (59%) diff --git a/hosts/rx4/services/default.nix b/hosts/rx4/services/default.nix index 71ead6d..385a957 100644 --- a/hosts/rx4/services/default.nix +++ b/hosts/rx4/services/default.nix @@ -18,6 +18,8 @@ ./nginx.nix ./open-webui-oci.nix ./print-server.nix + ./rss-bridge.nix + ./rsshub-oci.nix ./vaultwarden.nix # ./alditalk-extender.nix # FIXME diff --git a/hosts/sid/services/rss-bridge.nix b/hosts/rx4/services/rss-bridge.nix similarity index 92% rename from hosts/sid/services/rss-bridge.nix rename to hosts/rx4/services/rss-bridge.nix index 9016a71..4498d33 100644 --- a/hosts/sid/services/rss-bridge.nix +++ b/hosts/rx4/services/rss-bridge.nix @@ -14,7 +14,7 @@ reverseProxy = { enable = true; subdomain = constants.services.rss-bridge.subdomain; - forceSSL = true; + forceSSL = false; }; }; } diff --git a/hosts/sid/services/rsshub-oci.nix b/hosts/rx4/services/rsshub-oci.nix similarity index 59% rename from hosts/sid/services/rsshub-oci.nix rename to hosts/rx4/services/rsshub-oci.nix index 5229a31..1a1e0dd 100644 --- a/hosts/sid/services/rsshub-oci.nix +++ b/hosts/rx4/services/rsshub-oci.nix @@ -10,10 +10,5 @@ services.rsshub-oci = { enable = true; inherit (constants.services.rsshub-oci) port; - reverseProxy = { - enable = true; - subdomain = constants.services.rss-bridge.subdomain; - forceSSL = true; - }; }; } diff --git a/hosts/sid/services/default.nix b/hosts/sid/services/default.nix index caf4d05..c753168 100644 --- a/hosts/sid/services/default.nix +++ b/hosts/sid/services/default.nix @@ -17,8 +17,6 @@ ./netdata.nix ./nginx.nix ./radicale.nix - ./rss-bridge.nix - ./rsshub-oci.nix ./step-ca.nix ]; } diff --git a/hosts/sid/services/nginx.nix b/hosts/sid/services/nginx.nix index 7a9cff7..d1cd949 100644 --- a/hosts/sid/services/nginx.nix +++ b/hosts/sid/services/nginx.nix @@ -77,6 +77,18 @@ in error_log /var/log/nginx/open-webui-error.log debug; ''; }; + virtualHosts."${constants.services.rss-bridge.fqdn}" = { + enableACME = ssl; + forceSSL = ssl; + locations."/" = { + proxyPass = "http://${constants.hosts.rx4.ip}"; + }; + }; + virtualHosts."${constants.services.rsshub-oci.fqdn}" = mkVirtualHost { + inherit ssl; + address = constants.hosts.rx4.ip; + port = constants.services.rsshub-oci.port; + }; virtualHosts."${constants.services.vaultwarden.fqdn}" = { useACMEHost = "sid-internal"; forceSSL = ssl;