diff options
| author | Jean-Baptiste Giraudeau <jb@giraudeau.info> | 2017-11-08 20:26:03 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-11-09 12:56:11 +0100 |
| commit | 4f3d971ef55b82ef349e5fb198196d2028fc0cf5 (patch) | |
| tree | dd26dacc8ee8b23ec64d5dbf82f727b014d9f62d /nixos/modules/services/web-apps | |
| parent | 3c06d9f0b093e29206ff0b7e78917f198eafb01c (diff) | |
| download | nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar.gz nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar.bz2 nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar.lz nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar.xz nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.tar.zst nixlib-4f3d971ef55b82ef349e5fb198196d2028fc0cf5.zip | |
Atlassian apps: remove misleading JRE switch logic
Only the Oracle JRE is supported by Atlassian appsAtlassian apps (see https://jira.atlassian.com/browse/JRASERVER-46152) Plus Atlassian apps are non free so the switch logic always chose Oracle JRE anyway. Option is kept in case someone want to patch apps to support openjdk.
Diffstat (limited to 'nixos/modules/services/web-apps')
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/confluence.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/crowd.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 10 |
3 files changed, 9 insertions, 21 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index 51f6847a19c9..d59dd011c56a 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -127,14 +127,10 @@ in - jrePackage = let - jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; - in mkOption { + jrePackage = mkOption { type = types.package; - default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; - defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; - example = literalExample "pkgs.openjdk8.jre"; - description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE."; + default = pkgs.oraclejre8; + description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index a44aaf0238b9..97bec1b4b82a 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -93,14 +93,10 @@ in }; }; - jrePackage = let - jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; - in mkOption { + jrePackage = mkOption { type = types.package; - default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; - defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; - example = literalExample "pkgs.openjdk8.jre"; - description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE."; + default = pkgs.oraclejre8; + description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index b730a8ebee49..9408831731fe 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -131,14 +131,10 @@ in }; }; - jrePackage = let - jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; - in mkOption { + jrePackage = mkOption { type = types.package; - default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; - defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; - example = literalExample "pkgs.openjdk8.jre"; - description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE."; + default = pkgs.oraclejre8; + description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; |