public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atlassian services: allow overriding package (#55685)

Browse Source
This commit is contained in:
Francesco Zanini 2019-02-13 09:08:13 +01:00 committed by Franz Pletz
parent 2d022e7fa2
commit ab912cf744
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/web-apps/atlassian/confluence.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.confluence; 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; enableSSO = cfg.sso.enable;
crowdProperties = '' crowdProperties = ''
application.name ${cfg.sso.applicationName} 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 { jrePackage = mkOption {
type = types.package; type = types.package;

9
nixos/modules/services/web-apps/atlassian/crowd.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.crowd; cfg = config.services.crowd;
pkg = pkgs.atlassian-crowd.override { pkg = cfg.package.override {
home = cfg.home; home = cfg.home;
port = cfg.listenPort; port = cfg.listenPort;
openidPassword = cfg.openidPassword; 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 { jrePackage = mkOption {
type = types.package; type = types.package;
default = pkgs.oraclejre8; default = pkgs.oraclejre8;

9
nixos/modules/services/web-apps/atlassian/jira.nix
View File

@ -6,7 +6,7 @@ let
cfg = config.services.jira; 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; enableSSO = cfg.sso.enable;
crowdProperties = '' crowdProperties = ''
application.name ${cfg.sso.applicationName} 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 { jrePackage = mkOption {
type = types.package; type = types.package;
default = pkgs.oraclejre8; default = pkgs.oraclejre8;