Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 60232e269ed3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aad7774d7cdd
Choose a head ref
  • 5 commits
  • 5 files changed
  • 2 contributors

Commits on Nov 20, 2017

  1. Fix atlassian services (optional attr. and systemd) 

     - Properly handle optional configuration.
 - Use ExecStart/ExecStop instead of script/stopScript.

(cherry picked from commit 3c06d9f)
    @jbgi @globin
    jbgi authored and globin committed Nov 20, 2017
    Copy the full SHA
    82a89f0 View commit details

  2. 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.

(cherry picked from commit 4f3d971)
    @jbgi @globin
    jbgi authored and globin committed Nov 20, 2017
    Copy the full SHA
    1811a74 View commit details

  3. atlassian-jira: 7.5.1 -> 7.5.2 

    (cherry picked from commit d4622c6)
    @jbgi @globin
    jbgi authored and globin committed Nov 20, 2017
    Copy the full SHA
    7c0577b View commit details

  4. confluence: 6.4.2 -> 6.5.0 

    (cherry picked from commit 1209773)
    @jbgi @globin
    jbgi authored and globin committed Nov 20, 2017
    Copy the full SHA
    a6c77f1 View commit details

  5. nixos/atlassian: Fix eval error in jrePackage 

    The error got introduced by 4f3d971,
which removed the *Text attributes from the option.

This in turn leads to an evaluation error while building the
manual/manpage, because oraclejre8 is marked unfree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jbgi, @orivej, @globin
(cherry picked from commit 0e790b9)
    @aszlig @globin
    aszlig authored and globin committed Nov 20, 2017
    Copy the full SHA
    aad7774 View commit details
16 changes: 6 additions & 10 deletions nixos/modules/services/web-apps/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -127,14 +127,11 @@ 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;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -178,14 +175,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';

script = "${pkg}/bin/start-confluence.sh -fg";
stopScript = "${pkg}/bin/stop-confluence.sh";

serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/start-confluence.sh -fg";
ExecStop = "${pkg}/bin/stop-confluence.sh";
};
};
};
19 changes: 8 additions & 11 deletions nixos/modules/services/web-apps/atlassian/crowd.nix
View file
Original file line number Diff line number Diff line change
@@ -9,9 +9,10 @@ let
pkg = pkgs.atlassian-crowd.override {
home = cfg.home;
port = cfg.listenPort;
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
openidPassword = cfg.openidPassword;
};
} // (optionalAttrs cfg.proxy.enable {
proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
});

in

@@ -92,14 +93,11 @@ 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;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -142,13 +140,12 @@ in
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
'';

script = "${pkg}/start_crowd.sh -fg";

serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/start_crowd.sh -fg";
};
};
};
20 changes: 8 additions & 12 deletions nixos/modules/services/web-apps/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ let

cfg = config.services.jira;

pkg = pkgs.atlassian-jira.override {
pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
crowdProperties = ''
application.name ${cfg.sso.applicationName}
@@ -21,7 +21,7 @@ let
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
};
});

in

@@ -131,14 +131,11 @@ 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;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -183,14 +180,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';

script = "${pkg}/bin/start-jira.sh -fg";
stopScript = "${pkg}/bin/stop-jira.sh";

serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/start-jira.sh -fg";
ExecStop = "${pkg}/bin/stop-jira.sh";
};
};
};
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-confluence-${version}";
version = "6.4.2";
version = "6.5.0";

src = fetchurl {
url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
sha256 = "1akwbgbks6k63m22vrcvvz9jz4wqz380j8gb8lzbzm4yk8y7f4p9";
sha256 = "1prac65yczrarb38vvlp7srrhd4gb1zi5v88myfkp6rhwfrdxd0n";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "7.5.1";
version = "7.5.2";

src = fetchurl {
url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0dl9sjp1z7h340phmfhwha2j7hj5zcspk8v7n6vhsrfsjbkm80vy";
sha256 = "00x00q6k4sb89aipqd28lgn8l7k7w33dpg18r1dn6l7rws1mazfx";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];