Merge pull request #257415 from ehmry/yggdrasil

nixos/yggdrasil: add extraArgs option

Lin Jian 272dba1e 95503b92

Changed files
+9 -1
nixos
modules
services
networking
tests
+8 -1
nixos/modules/services/networking/yggdrasil.nix
···
restarted. Keys are stored at ${keysPath}.
'');
+
extraArgs = mkOption {
+
type = listOf str;
+
default = [ ];
+
example = [ "-loglevel" "info" ];
+
description = lib.mdDoc "Extra command line arguments.";
+
};
+
};
};
···
"${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"}
# start yggdrasil
-
${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf
+
${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs}
'';
serviceConfig = {
+1
nixos/tests/yggdrasil.nix
···
networking.firewall.allowedTCPPorts = [ 43210 ];
services.yggdrasil = {
enable = true;
+
extraArgs = [ "-loglevel" "error" ];
denyDhcpcdInterfaces = [ "ygg0" ];
settings = {
IfTAPMode = true;