lol

hadoop,hbase: better default for HADOOP_CONF_DIR and HBASE_CONF_DIR

order of precedence:
- env var HADOOP_CONF_DIR for hadoop and HBASE_CONF_DIR for hbase, if set
- /etc/hadoop-conf, if present
- default confs in package

authored by

illustris and committed by
pennae
cb2576c1 53f2d712

+5 -2
+2 -1
pkgs/applications/networking/cluster/hadoop/default.nix
··· 51 51 makeWrapper "$n" "$out/bin/$(basename $n)"\ 52 52 --set-default JAVA_HOME ${jdk.home}\ 53 53 --set-default HADOOP_HOME $out/lib/${untarDir}\ 54 - --set-default HADOOP_CONF_DIR /etc/hadoop-conf/\ 54 + --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ 55 + --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\ 55 56 --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ 56 57 --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" 57 58 done
+3 -1
pkgs/servers/hbase/default.nix
··· 21 21 installPhase = '' 22 22 mkdir -p $out 23 23 cp -R * $out 24 - wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} 24 + wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} \ 25 + --run "test -d /etc/hadoop-conf && export HBASE_CONF_DIR=\''${HBASE_CONF_DIR-'/etc/hadoop-conf/'}" \ 26 + --set-default HBASE_CONF_DIR "$out/conf/" 25 27 ''; 26 28 27 29 passthru = { inherit tests; };