From 2b7e1ddb4a7f761877244f6aa35ca61a5eec2456 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 5 Feb 2024 17:17:45 +0100 Subject: nixos/youtrack: fix warnings (#285775) * nixos/youtrack: fix extraParams warning * nixos/youtrack: use new option for port in nginx config --- nixos/modules/services/web-apps/youtrack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index abb4292113b6..08e180b520f0 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -137,7 +137,7 @@ in config = lib.mkIf cfg.enable { warnings = lib.optional (lib.versions.major cfg.package.version <= "2022") "YouTrack 2022.x is deprecated. See https://nixos.org/manual/nixos/unstable/index.html#module-services-youtrack for details on how to upgrade." - ++ lib.optional (cfg.extraParams != "" && (lib.versions.major cfg.package.version >= "2023")) + ++ lib.optional (cfg.extraParams != {} && (lib.versions.major cfg.package.version >= "2023")) "'services.youtrack.extraParams' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'" ++ lib.optional (cfg.jvmOpts != "" && (lib.versions.major cfg.package.version >= "2023")) "'services.youtrack.jvmOpts' is deprecated and has no effect on YouTrack 2023.x and newer. Please migrate to 'services.youtrack.generalParameters'"; @@ -231,7 +231,7 @@ in users.groups.youtrack = {}; services.nginx = lib.mkIf (cfg.virtualHost != null) { - upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {}; + upstreams.youtrack.servers."${cfg.address}:${toString cfg.environmentalParameters.listen-port}" = {}; virtualHosts.${cfg.virtualHost}.locations = { "/" = { proxyPass = "http://youtrack"; -- cgit 1.4.1