From f030bb79ecfcc082a139079d88bf7626e366c0db Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 23 Feb 2023 19:59:25 +0100 Subject: [PATCH] service/freshrss: remove baseUrl setting --- machines/newton/services.nix | 1 - modules/services/freshrss/default.nix | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/machines/newton/services.nix b/machines/newton/services.nix index 23dc030..f5b6cf4 100644 --- a/machines/newton/services.nix +++ b/machines/newton/services.nix @@ -67,7 +67,6 @@ in freshrss = { enable = true; defaultUser = "felix"; - baseUrl = "https://news.buehler.rocks"; passwordFile = secrets."freshrss/password".path; }; # self-hosted git service diff --git a/modules/services/freshrss/default.nix b/modules/services/freshrss/default.nix index b7cf4c0..781f52e 100644 --- a/modules/services/freshrss/default.nix +++ b/modules/services/freshrss/default.nix @@ -27,12 +27,6 @@ in example = "/run/secrets/freshrss"; }; - baseUrl = mkOption { - type = types.str; - description = "Default URL for FreshRSS."; - example = "https://freshrss.example.com"; - }; - language = mkOption { type = types.str; default = "en"; @@ -44,7 +38,8 @@ in config = lib.mkIf cfg.enable { services.freshrss = { enable = true; - inherit (cfg) baseUrl language passwordFile defaultUser; + baseUrl = "https://news.${domain}"; + inherit (cfg) language passwordFile defaultUser; }; # Set up a Nginx virtual host.