ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-11 07:15:54 +03:00
Code Issues Projects Releases Wiki Activity

nixos/yggdrasil: add extraArgs option

Browse Source
This commit is contained in:
Emery Hemingway 2023-09-26 09:04:33 +01:00
parent fdd898f8f7
commit 3fc4ecafeb
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}. 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"} "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"}
# start yggdrasil # start yggdrasil
${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs}
''; '';
serviceConfig = { serviceConfig = {

1
nixos/tests/yggdrasil.nix
View File

@ -116,6 +116,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : {
networking.firewall.allowedTCPPorts = [ 43210 ]; networking.firewall.allowedTCPPorts = [ 43210 ];
services.yggdrasil = { services.yggdrasil = {
enable = true; enable = true;
extraArgs = [ "-loglevel" "error" ];
denyDhcpcdInterfaces = [ "ygg0" ]; denyDhcpcdInterfaces = [ "ygg0" ];
settings = { settings = {
IfTAPMode = true; IfTAPMode = true;