diff --git a/hosts/rx4/services/default.nix b/hosts/rx4/services/default.nix index 385a957..71ead6d 100644 --- a/hosts/rx4/services/default.nix +++ b/hosts/rx4/services/default.nix @@ -18,8 +18,6 @@ ./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/default.nix b/hosts/sid/services/default.nix index c753168..caf4d05 100644 --- a/hosts/sid/services/default.nix +++ b/hosts/sid/services/default.nix @@ -17,6 +17,8 @@ ./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 d1cd949..7a9cff7 100644 --- a/hosts/sid/services/nginx.nix +++ b/hosts/sid/services/nginx.nix @@ -77,18 +77,6 @@ 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; diff --git a/hosts/rx4/services/rss-bridge.nix b/hosts/sid/services/rss-bridge.nix similarity index 92% rename from hosts/rx4/services/rss-bridge.nix rename to hosts/sid/services/rss-bridge.nix index 4498d33..9016a71 100644 --- a/hosts/rx4/services/rss-bridge.nix +++ b/hosts/sid/services/rss-bridge.nix @@ -14,7 +14,7 @@ reverseProxy = { enable = true; subdomain = constants.services.rss-bridge.subdomain; - forceSSL = false; + forceSSL = true; }; }; } diff --git a/hosts/rx4/services/rsshub-oci.nix b/hosts/sid/services/rsshub-oci.nix similarity index 59% rename from hosts/rx4/services/rsshub-oci.nix rename to hosts/sid/services/rsshub-oci.nix index 1a1e0dd..5229a31 100644 --- a/hosts/rx4/services/rsshub-oci.nix +++ b/hosts/sid/services/rsshub-oci.nix @@ -10,5 +10,10 @@ services.rsshub-oci = { enable = true; inherit (constants.services.rsshub-oci) port; + reverseProxy = { + enable = true; + subdomain = constants.services.rss-bridge.subdomain; + forceSSL = true; + }; }; }