summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Lackerbauer <simon@lackerbauer.com>2018-03-21 20:02:07 +0100
committerRobin Gloster <mail@glob.in>2018-05-24 04:40:47 +0200
commit120e93928f1071a5589e520a7542577a70dc736f (patch)
tree336fad420e2b841206894b25adc9e1492ba81d00
parentde5205ae2dd7688a5a80c289bd5fac5f831ad585 (diff)
downloadnixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar.gz
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar.bz2
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar.lz
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar.xz
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.tar.zst
nixpkgs-120e93928f1071a5589e520a7542577a70dc736f.zip
crowd: 3.0.1 -> 3.1.2
-rw-r--r--nixos/modules/services/web-apps/atlassian/crowd.nix5
-rw-r--r--pkgs/servers/atlassian/crowd.nix4
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 0ac941b6ec9..778e4afa1e0 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -126,12 +126,13 @@ in
       };
 
       preStart = ''
-        mkdir -p ${cfg.home}/{logs,work,database}
+        rm -rf ${cfg.home}/work
+        mkdir -p ${cfg.home}/{logs,database,work}
 
         mkdir -p /run/atlassian-crowd
         ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd
 
-        chown -R ${cfg.user} ${cfg.home}
+        chown -R ${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/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 6d7b332da13..4989c3a417a 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.0.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "17pz0rgzdv40sbvzb9w6xmdg598m6gs7gsznfnxcy1j011cgg1wr";
+    sha256 = "0pnl0zl38827ckgxh4y1mnq3lr7bvd7v3ysdxxv3nfr5zya4xgki";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];