git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #98107 from roberth/cassandra-add-extraEnvSh

nixos/cassandra: Add cfg.extraEnvSh

commit0504b01100c6a00e7c133ea8817806c80dca6388 authorRobert Hensing <roberth@users.noreply.github.com> dateWed 7 Oct 2020, 11:28 (6 years ago) parentc7f33a52d2612a
1 file changed+14−1
nixos/modules/services/databases/cassandra.nix+14−1
nixos/modules/services/databases/cassandra.nix+14−1
@@ -38,13 +38,18 @@ let
3838 cassandraYaml = builtins.toJSON cassandraConfigWithAddresses;
3939 cassandraEnvPkg = "${cfg.package}/conf/cassandra-env.sh";
4040 cassandraLogbackConfig = pkgs.writeText "logback.xml" cfg.logbackConfig;
41+ passAsFile = [ "extraEnvSh" ];
42+ inherit (cfg) extraEnvSh;
4143 buildCommand = ''
4244 mkdir -p "$out"
4345
4446 echo "$cassandraYaml" > "$out/cassandra.yaml"
4547 ln -s "$cassandraLogbackConfig" "$out/logback.xml"
4648
47− cp "$cassandraEnvPkg" "$out/cassandra-env.sh"
49+ ( cat "$cassandraEnvPkg"
50+ echo "# lines from services.cassandra.extraEnvSh: "
51+ cat "$extraEnvShPath"
52+ ) > "$out/cassandra-env.sh"
4853
4954 # Delete default JMX Port, otherwise we can't set it using env variable
5055 sed -i '/JMX_PORT="7199"/d' "$out/cassandra-env.sh"
@@ -224,6 +229,14 @@ in {
224229 Extra options to be merged into cassandra.yaml as nix attribute set.
225230 '';
226231 };
232+ extraEnvSh = mkOption {
233+ type = types.lines;
234+ default = "";
235+ example = "CLASSPATH=$CLASSPATH:\${extraJar}";
236+ description = ''
237+ Extra shell lines to be appended onto cassandra-env.sh.
238+ '';
239+ };
227240 fullRepairInterval = mkOption {
228241 type = types.nullOr types.str;
229242 default = "3w";