diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2023-09-26 09:04:33 +0100 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2023-10-06 17:59:14 +0100 |
| commit | 3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975 (patch) | |
| tree | a81ce771015a3aaa5141326776e825744b461924 | |
| parent | fdd898f8f79e8d2f99ed2ab6b3751811ef683242 (diff) | |
| download | nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar.gz nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar.bz2 nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar.lz nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar.xz nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.tar.zst nixpkgs-3fc4ecafeb375d1c72c5b48bdd3c5e15bc408975.zip | |
nixos/yggdrasil: add extraArgs option
| -rw-r--r-- | nixos/modules/services/networking/yggdrasil.nix | 9 | ||||
| -rw-r--r-- | nixos/tests/yggdrasil.nix | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 55a6002d61a..8335583d2da 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -121,6 +121,13 @@ in restarted. Keys are stored at ${keysPath}. ''); + extraArgs = mkOption { + type = listOf str; + default = [ ]; + example = [ "-loglevel" "info" ]; + description = lib.mdDoc "Extra command line arguments."; + }; + }; }; @@ -181,7 +188,7 @@ in "${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 = { diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index eaf14e29acb..70d148380bf 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -116,6 +116,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 43210 ]; services.yggdrasil = { enable = true; + extraArgs = [ "-loglevel" "error" ]; denyDhcpcdInterfaces = [ "ygg0" ]; settings = { IfTAPMode = true; |