diff --git a/hosts/haru/services/blocky.nix b/hosts/haru/services/blocky.nix index 9e5ad3d..8717dac 100644 --- a/hosts/haru/services/blocky.nix +++ b/hosts/haru/services/blocky.nix @@ -118,7 +118,6 @@ "prowlarr.internal.flake.sh" = "192.168.1.54"; "stash.internal.flake.sh" = "192.168.1.98"; "nextcloud.internal.flake.sh" = "192.168.1.199"; - "news.internal.flake.sh" = "192.168.1.98"; # misc diff --git a/hosts/sakura/services/default.nix b/hosts/sakura/services/default.nix index cbf8e30..59d4fb0 100644 --- a/hosts/sakura/services/default.nix +++ b/hosts/sakura/services/default.nix @@ -10,5 +10,6 @@ ./conduit.nix ./tailscale.nix ./justlog.nix + ./miniflux.nix ]; } diff --git a/hosts/yuki/services/miniflux.nix b/hosts/sakura/services/miniflux.nix similarity index 52% rename from hosts/yuki/services/miniflux.nix rename to hosts/sakura/services/miniflux.nix index 8fb2977..d68d6e7 100644 --- a/hosts/yuki/services/miniflux.nix +++ b/hosts/sakura/services/miniflux.nix @@ -3,8 +3,6 @@ lib, ... }: { - networking.firewall.allowedTCPPorts = [9000]; - sops.secrets.miniflux = {}; services.miniflux = { @@ -13,7 +11,10 @@ config = { LISTEN_ADDR = "0.0.0.0"; PORT = 9000; - DATABASE_URL = lib.mkForce "host=192.168.1.211 port=5432 user=miniflux password=miniflux dbname=miniflux sslmode=disable"; + BASE_URL = "https://rss.flake.sh"; + HTTPS = "true"; + WEBAUTHN = "true"; + DATABASE_URL = lib.mkForce "host=100.94.214.100 port=5432 user=miniflux password=miniflux dbname=miniflux sslmode=disable"; }; }; } diff --git a/hosts/sora/networking.nix b/hosts/sora/networking.nix index 642bece..8bf14b4 100644 --- a/hosts/sora/networking.nix +++ b/hosts/sora/networking.nix @@ -30,6 +30,5 @@ }; services.udev.extraRules = '' ATTR{address}=="96:00:02:c2:dc:83", NAME="eth0" - ''; } diff --git a/hosts/sora/services/traefik.nix b/hosts/sora/services/traefik.nix index 356d812..92ab83b 100644 --- a/hosts/sora/services/traefik.nix +++ b/hosts/sora/services/traefik.nix @@ -160,6 +160,13 @@ tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; + miniflux = { + rule = "Host(`rss.flake.sh`)"; + entrypoints = ["websecure"]; + service = "miniflux"; + tls.domains = [{main = "*.flake.sh";}]; + tls.certresolver = "production"; + }; }; services = { forgejo.loadBalancer = { @@ -181,6 +188,7 @@ attic.loadBalancer.servers = [{url = "http://100.104.42.96:8200";}]; minio.loadBalancer.servers = [{url = "http://100.69.79.81:9005";}]; woodpecker.loadBalancer.servers = [{url = "http://100.82.146.40:8200";}]; + miniflux.loadBalancer.servers = [{url = "http://100.121.201.47:9000";}]; }; }; }; diff --git a/hosts/yuki/services/default.nix b/hosts/yuki/services/default.nix index 2d996aa..4e0c566 100644 --- a/hosts/yuki/services/default.nix +++ b/hosts/yuki/services/default.nix @@ -8,6 +8,5 @@ ./wallos.nix ./homepage.nix ./searxng.nix - ./miniflux.nix ]; } diff --git a/hosts/yuki/services/traefik.nix b/hosts/yuki/services/traefik.nix index b194471..b4b5044 100644 --- a/hosts/yuki/services/traefik.nix +++ b/hosts/yuki/services/traefik.nix @@ -45,11 +45,6 @@ _: { entrypoints = ["web"]; service = "hass"; }; - miniflux = { - rule = "Host(`news.internal.flake.sh`)"; - entrypoints = ["web"]; - service = "miniflux"; - }; }; services = { stash.loadBalancer.servers = [{url = "http://localhost:9999";}]; @@ -59,7 +54,6 @@ _: { wallos.loadBalancer.servers = [{url = "http://localhost:8282";}]; searxng.loadBalancer.servers = [{url = "http://localhost:8100";}]; hass.loadBalancer.servers = [{url = "http://localhost:8123";}]; - miniflux.loadBalancer.servers = [{url = "http://localhost:9000";}]; }; }; };