From c3d1ab3ecdcf97f1f002333ecced4456267c829c Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Sun, 26 Nov 2023 23:27:58 -0800 Subject: [PATCH] initial transfer of miniflux from kestrel to torus --- provision/hosts/kestrel/configuration.nix | 1 - provision/hosts/torus/configuration.nix | 4 ++++ provision/hosts/{kestrel => torus}/rss.nix | 8 ++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) rename provision/hosts/{kestrel => torus}/rss.nix (78%) diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 063b7344..b4f789ae 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, user, lib, ... }: { imports = [ - ./rss.nix ./syncthing.nix ]; diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix index 1de9bdbe..9fe6ea8c 100644 --- a/provision/hosts/torus/configuration.nix +++ b/provision/hosts/torus/configuration.nix @@ -7,6 +7,7 @@ ./syncthing.nix ./obsidian-vault.nix ./share.nix + ./rss.nix ]; nix = { @@ -116,6 +117,9 @@ "rss.tstarr.us" = (SSL // { locations."/".proxyPass = "http://localhost:8081/"; }); + "rss1.tstarr.us" = (SSL // { + locations."/".proxyPass = "http://localhost:8087/"; + }); "rssbridge.tstarr.us" = (SSL // { locations."/".proxyPass = "http://localhost:3000/"; }); diff --git a/provision/hosts/kestrel/rss.nix b/provision/hosts/torus/rss.nix similarity index 78% rename from provision/hosts/kestrel/rss.nix rename to provision/hosts/torus/rss.nix index a58a3502..554490be 100644 --- a/provision/hosts/kestrel/rss.nix +++ b/provision/hosts/torus/rss.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, user, ... }: { - services.postgresql = { enable = true; authentication = pkgs.lib.mkOverride 10 '' @@ -8,13 +7,18 @@ local all all trust ''; }; + + networking.firewall.allowedTCPPorts = [ 8087 ]; + networking.firewall.allowedUDPPorts = [ 8087 ]; + services.miniflux = { enable = true; config = { - LISTEN_ADDR = "localhost:8087"; + PORT = "8087"; # Break youtube embeds so they dont show YOUTUBE_EMBED_URL_OVERRIDE="https://"; }; + # Set initial admin user/password adminCredentialsFile = pkgs.writeText "cred" '' ADMIN_USERNAME=miniflux ADMIN_PASSWORD=miniflux