From b60f8fc6e2a0af1f5e1af3c7e0c9aaa9230a858d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 22 Nov 2018 08:50:59 +0100 Subject: [PATCH 1/6] atlassian modules: don't chown home recursively This can take a long time and should not be necassary anyway. --- nixos/modules/services/web-apps/atlassian/confluence.nix | 2 +- nixos/modules/services/web-apps/atlassian/crowd.nix | 2 +- nixos/modules/services/web-apps/atlassian/jira.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index f896d92fd6f..b71887fcc6e 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -166,7 +166,7 @@ in ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence ln -sf ${cfg.home} /run/confluence/home - chown -R ${cfg.user} ${cfg.home} + chown ${cfg.user} ${cfg.home} sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index b6cb9f3b7c4..1fb619da93e 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -132,7 +132,7 @@ in mkdir -p /run/atlassian-crowd ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd - chown -R ${cfg.user}:${cfg.group} ${cfg.home} + chown ${cfg.user}:${cfg.group} ${cfg.home} sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index f5ec0a5f31b..dba970c612b 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -171,7 +171,7 @@ in ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira ln -sf ${cfg.home} /run/atlassian-jira/home - chown -R ${cfg.user} ${cfg.home} + chown ${cfg.user} ${cfg.home} sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' From ece39b063807bc3a582bb5234e6cc05b250a0446 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 22 Oct 2018 17:49:58 +0200 Subject: [PATCH 2/6] atlassian-confluence: 6.11.1 -> 6.12.0 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 617ae3ee1d1..181a3fd9030 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.11.1"; + version = "6.12.0"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0sp1ggllvxdz0pf409yyil1x9dah1jyqspknfzgivkmwhcqj7brr"; + sha256 = "0ip3j6id0554ynrs1rcxck4cs8j2hgxkv1rha9xhqikm89bdml7h"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; From 847bd6e2d43a1c8013798f3677888f6642f025b0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 21 Nov 2018 02:22:30 +0100 Subject: [PATCH 3/6] atlassian-confluence: 6.12.0 -> 6.12.2 --- pkgs/servers/atlassian/confluence.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 181a3fd9030..bed9319c7c2 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0ip3j6id0554ynrs1rcxck4cs8j2hgxkv1rha9xhqikm89bdml7h"; + sha256 = "043ng5q1rawmajgvdjzgch8baack8rxsi3qyln79gb00cy3sv9y0"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; From 4a38287887e169805ab88233edc559224deffe8b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Jan 2019 19:12:40 +0100 Subject: [PATCH 4/6] atlassian-confluence: 6.12.2 -> 6.13.0 --- pkgs/servers/atlassian/confluence.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index bed9319c7c2..db80682d899 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.12.2"; + version = "6.13.0"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "043ng5q1rawmajgvdjzgch8baack8rxsi3qyln79gb00cy3sv9y0"; + sha256 = "1ckpcb0dq964gwdls5q71260r0i8zxgx8nzv8y4sizr37jvpi8mw"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildPhase = '' echo "confluence.home=/run/confluence/home" > confluence/WEB-INF/classes/confluence-init.properties mv conf/server.xml conf/server.xml.dist From 89d24aca9358e07d50f2301800b35a2a0818d36c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Jan 2019 19:13:21 +0100 Subject: [PATCH 5/6] atlassian-crowd: 3.2.5 -> 3.3.3 --- nixos/modules/services/web-apps/atlassian/crowd.nix | 3 ++- pkgs/servers/atlassian/crowd.nix | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 1fb619da93e..9f48d1e16a4 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -130,9 +130,10 @@ in mkdir -p ${cfg.home}/{logs,database,work} mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd + ln -sf ${cfg.home}/{database,logs,work,server.xml} /run/atlassian-crowd chown ${cfg.user}:${cfg.group} ${cfg.home} + chown ${cfg.user}:${cfg.group} ${cfg.home}/{logs,database,work} sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ '' + (lib.optionalString cfg.proxy.enable '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 4ad0388e8db..6bde7e187d7 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "atlassian-crowd-${version}"; - version = "3.2.5"; + version = "3.3.3"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; - sha256 = "1h8kxh89d2wm0hkgrzx5dnnfy8sbhpgisgdwn3srhb4js8h4qil6"; + sha256 = "1mdjxr4p56rlsgnv78bfnlwmniv8hv3hdxnfvqzsmvv88s3z7c66"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml - rm -rf apache-tomcat/work + rm -rf apache-tomcat/{logs,work} + ln -s /run/atlassian-crowd/logs apache-tomcat/logs ln -s /run/atlassian-crowd/work apache-tomcat/work ln -s /run/atlassian-crowd/database database From 6f02b8672645ec02967799237b37d3a3825bffc6 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 7 Jan 2019 19:13:39 +0100 Subject: [PATCH 6/6] atlassian-jira: 7.12.3 -> 7.13.0 --- pkgs/servers/atlassian/jira.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index b9c5951b0b2..8e11ef6163c 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.12.3"; + version = "7.13.0"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv"; + sha256 = "1dra5h8lgqwzhs95br8x34c5pcrkgrkmpyhiq9vbayf1aarjxfnq"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];