Merge pull request #27627 from volth/zookeeper-escape-shell

nixos/zookeeper: escape cfg.extraCmdLineOptions

Changed files
+3 -3
nixos
modules
services
+3 -3
nixos/modules/services/misc/zookeeper.nix
···
let
cfg = config.services.zookeeper;
-
zookeeperConfig = ''
dataDir=${cfg.dataDir}
clientPort=${toString cfg.port}
···
default = 1;
type = types.int;
};
-
extraConf = mkOption {
description = "Extra configuration for Zookeeper.";
type = types.lines;
···
ExecStart = ''
${pkgs.jre}/bin/java \
-cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
-
${toString cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
org.apache.zookeeper.server.quorum.QuorumPeerMain \
···
let
cfg = config.services.zookeeper;
+
zookeeperConfig = ''
dataDir=${cfg.dataDir}
clientPort=${toString cfg.port}
···
default = 1;
type = types.int;
};
+
extraConf = mkOption {
description = "Extra configuration for Zookeeper.";
type = types.lines;
···
ExecStart = ''
${pkgs.jre}/bin/java \
-cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
+
${escapeShellArgs cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
org.apache.zookeeper.server.quorum.QuorumPeerMain \