Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixos/logstash: Add logstashJvmOptionsFile option

+13
+13
nixos/modules/services/logging/logstash.nix
··· 23 24 logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; 25 26 logstashSettingsDir = pkgs.runCommand "logstash-settings" { 27 inherit logstashSettingsYml; 28 preferLocalBuild = true; 29 } '' 30 mkdir -p $out 31 ln -s $logstashSettingsYml $out/logstash.yml 32 ''; 33 in 34 ··· 152 ''; 153 }; 154 155 156 }; 157 };
··· 23 24 logstashSettingsYml = pkgs.writeText "logstash.yml" cfg.extraSettings; 25 26 + logstashJvmOptionsFile = pkgs.writeText "jvm.options" cfg.extraJvmOptions; 27 + 28 logstashSettingsDir = pkgs.runCommand "logstash-settings" { 29 + inherit logstashJvmOptionsFile; 30 inherit logstashSettingsYml; 31 preferLocalBuild = true; 32 } '' 33 mkdir -p $out 34 ln -s $logstashSettingsYml $out/logstash.yml 35 + ln -s $logstashJvmOptionsFile $out/jvm.options 36 ''; 37 in 38 ··· 156 ''; 157 }; 158 159 + extraJvmOptions = mkOption { 160 + type = types.lines; 161 + default = ""; 162 + description = "Extra JVM options, one per line (jvm.options format)."; 163 + example = '' 164 + -Xms2g 165 + -Xmx2g 166 + ''; 167 + }; 168 169 }; 170 };