diff options
author | Francesco Zanini <francesco@zanini.me> | 2019-02-13 09:08:13 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-02-13 08:08:13 +0000 |
commit | ab912cf744d38d1ac1c4e3b6da0283f762559cf2 (patch) | |
tree | 6fa94a916ab3f5d42aa031f821ce644a08121907 /nixos/modules/services/web-apps | |
parent | 2d022e7fa2e1687ee6354c800363f7e2d68d4870 (diff) | |
download | nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar.gz nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar.bz2 nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar.lz nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar.xz nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.tar.zst nixpkgs-ab912cf744d38d1ac1c4e3b6da0283f762559cf2.zip |
atlassian services: allow overriding package (#55685)
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/confluence.nix | 9 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/crowd.nix | 9 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 9 |
3 files changed, 23 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index b71887fcc6e..15744d90cc7 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -6,7 +6,7 @@ let cfg = config.services.confluence; - pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable { + pkg = cfg.package.override (optionalAttrs cfg.sso.enable { enableSSO = cfg.sso.enable; crowdProperties = '' application.name ${cfg.sso.applicationName} @@ -125,7 +125,12 @@ in }; }; - + package = mkOption { + type = types.package; + default = pkgs.atlassian-confluence; + defaultText = "pkgs.atlassian-confluence"; + description = "Atlassian Confluence package to use."; + }; jrePackage = mkOption { type = types.package; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 9f48d1e16a4..c144b21bdaf 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -6,7 +6,7 @@ let cfg = config.services.crowd; - pkg = pkgs.atlassian-crowd.override { + pkg = cfg.package.override { home = cfg.home; port = cfg.listenPort; openidPassword = cfg.openidPassword; @@ -93,6 +93,13 @@ in }; }; + package = mkOption { + type = types.package; + default = pkgs.atlassian-crowd; + defaultText = "pkgs.atlassian-crowd"; + description = "Atlassian Crowd package to use."; + }; + jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index dba970c612b..0b3a5722d6c 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -6,7 +6,7 @@ let cfg = config.services.jira; - pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable { + pkg = cfg.package.override (optionalAttrs cfg.sso.enable { enableSSO = cfg.sso.enable; crowdProperties = '' application.name ${cfg.sso.applicationName} @@ -131,6 +131,13 @@ in }; }; + package = mkOption { + type = types.package; + default = pkgs.atlassian-jira; + defaultText = "pkgs.atlassian-jira"; + description = "Atlassian JIRA package to use."; + }; + jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; |