riak2: use sensible default paths

Make exporting the RIAK_{ETC,LOG,DATA}_DIR variables optional;
if they're not in the environment, we use the same default values as
NixOS.

Changed files
+4 -4
nixos
tests
pkgs
servers
nosql
riak
+1 -1
nixos/tests/riak.nix
···
$master->waitForUnit("riak");
$master->sleep(20); # Hopefully this is long enough!!
-
$master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1");
+
$master->succeed("riak ping 2>&1");
'';
}
+3 -3
pkgs/servers/nosql/riak/2.1.1.nix
···
postPatch = ''
sed -i deps/node_package/priv/base/env.sh \
-
-e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \
+
-e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \
-e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \
-e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \
-
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \
-
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@'
+
-e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \
+
-e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@'
'';
preBuild = ''