b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #257415 from ehmry/yggdrasil

Browse source 
nixos/yggdrasil: add extraArgs option
This commit is contained in:
Lin Jian 2023-10-07 02:05:36 +08:00 committed by GitHub
parent 95503b9292 3fc4ecafeb
commit 272dba1e31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/networking/yggdrasil.nix
View file

@ -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 = {

1
nixos/tests/yggdrasil.nix
View file

@ -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;