summary refs log tree commit diff
path: root/pkgs/servers/atlassian
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-07-25 12:02:57 +0200
committerGitHub <noreply@github.com>2022-07-25 12:02:57 +0200
commitf923f5b9aaa050732a37978853cb1753c0fd9a82 (patch)
tree00108df10a12300ce092c16bf46f168af8a00c79 /pkgs/servers/atlassian
parent785b28bee36d41498ff7a2acaf73242b0cd451c6 (diff)
parentee2413c326d32b66f316dcd80fce4a7ff94a72ba (diff)
downloadnixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar.gz
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar.bz2
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar.lz
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar.xz
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.tar.zst
nixpkgs-f923f5b9aaa050732a37978853cb1753c0fd9a82.zip
Merge pull request #182456 from mayflower/crowd-secrets
nixos/crowd: store openid password securely
Diffstat (limited to 'pkgs/servers/atlassian')
-rw-r--r--pkgs/servers/atlassian/crowd.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 7714fccf5d8..606bcf0ac2e 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -1,7 +1,14 @@
 { lib, stdenv, fetchurl, home ? "/var/lib/crowd"
 , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }:
 
-stdenv.mkDerivation rec {
+let
+  optionalWarning = cond: msg:
+    if cond then lib.warn msg
+    else lib.id;
+in
+
+optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!"
+(stdenv.mkDerivation rec {
   pname = "atlassian-crowd";
   version = "5.0.1";
 
@@ -46,4 +53,4 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     maintainers = with maintainers; [ fpletz globin ];
   };
-}
+})