every-channel/every.channel
1
0
Fork 0
Code Releases Activity Actions 2

nix: fix control discovery arg quoting in ec-node unit script

Browse source
This commit is contained in:
every.channel 2026-02-22 02:29:41 -08:00
parent faec62f9ae
commit 74842eb25e
No known key found for this signature in database
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nix/modules/ec-node.nix
View file

@ -227,6 +227,8 @@ in
"cmd+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.extraArgs)})"; "cmd+=(${lib.concatStringsSep " " (map lib.escapeShellArg cfg.extraArgs)})";
explicitInputStr = if b.input == null then "" else b.input; explicitInputStr = if b.input == null then "" else b.input;
channelStr = if b.channel == null then "" else b.channel; channelStr = if b.channel == null then "" else b.channel;
controlDiscoveryStr = if cfg.control.discovery == null then "" else cfg.control.discovery;
controlIrohSecretStr = if cfg.control.irohSecret == null then "" else cfg.control.irohSecret;
controlGossipPeerLines = lib.concatMapStrings (peer: "cmd+=(--gossip-peer ${lib.escapeShellArg peer})\n") cfg.control.gossipPeers; controlGossipPeerLines = lib.concatMapStrings (peer: "cmd+=(--gossip-peer ${lib.escapeShellArg peer})\n") cfg.control.gossipPeers;
in in
'' ''
@ -346,8 +348,14 @@ in
cmd+=(--control-announce) cmd+=(--control-announce)
cmd+=(--control-ttl-ms ${toString cfg.control.ttlMs}) cmd+=(--control-ttl-ms ${toString cfg.control.ttlMs})
cmd+=(--control-interval-ms ${toString cfg.control.intervalMs}) cmd+=(--control-interval-ms ${toString cfg.control.intervalMs})
${lib.optionalString (cfg.control.discovery != null) "cmd+=(--discovery ${lib.escapeShellArg cfg.control.discovery})"} control_discovery=${lib.escapeShellArg controlDiscoveryStr}
${lib.optionalString (cfg.control.irohSecret != null) "cmd+=(--iroh-secret ${lib.escapeShellArg cfg.control.irohSecret})"} if [[ -n "$control_discovery" ]]; then
cmd+=(--discovery "$control_discovery")
fi
control_iroh_secret=${lib.escapeShellArg controlIrohSecretStr}
if [[ -n "$control_iroh_secret" ]]; then
cmd+=(--iroh-secret "$control_iroh_secret")
fi
${controlGossipPeerLines} ${controlGossipPeerLines}
''} ''}
${extraArgsLine} ${extraArgsLine}