Merge pull request #257415 from ehmry/yggdrasil

nixos/yggdrasil: add extraArgs option

authored by

Lin Jian and committed by
GitHub
272dba1e 95503b92

+9 -1
+8 -1
nixos/modules/services/networking/yggdrasil.nix
··· 121 121 restarted. Keys are stored at ${keysPath}. 122 122 ''); 123 123 124 + extraArgs = mkOption { 125 + type = listOf str; 126 + default = [ ]; 127 + example = [ "-loglevel" "info" ]; 128 + description = lib.mdDoc "Extra command line arguments."; 129 + }; 130 + 124 131 }; 125 132 }; 126 133 ··· 181 188 "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"} 182 189 183 190 # start yggdrasil 184 - ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf 191 + ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} 185 192 ''; 186 193 187 194 serviceConfig = {
+1
nixos/tests/yggdrasil.nix
··· 116 116 networking.firewall.allowedTCPPorts = [ 43210 ]; 117 117 services.yggdrasil = { 118 118 enable = true; 119 + extraArgs = [ "-loglevel" "error" ]; 119 120 denyDhcpcdInterfaces = [ "ygg0" ]; 120 121 settings = { 121 122 IfTAPMode = true;