about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorLeona Maroni <dev@leona.is>2024-02-05 17:17:45 +0100
committerGitHub <noreply@github.com>2024-02-05 17:17:45 +0100
commit2b7e1ddb4a7f761877244f6aa35ca61a5eec2456 (patch)
tree97e406f01377f19afd1f5644219b1810c71c99db /nixos/modules
parent01cdd56ee607cb21994dea3888c9215b160422da (diff)
downloadnixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar.gz
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar.bz2
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar.lz
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar.xz
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.tar.zst
nixlib-2b7e1ddb4a7f761877244f6aa35ca61a5eec2456.zip
nixos/youtrack: fix warnings (#285775)
* nixos/youtrack: fix extraParams warning

* nixos/youtrack: use new option for port in nginx config
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/web-apps/youtrack.nix4
1 files changed, 2 insertions, 2 deletions
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";