Commit 3fc4ecaf authored by Emery Hemingway's avatar Emery Hemingway
Browse files

nixos/yggdrasil: add extraArgs option

parent fdd898f8

nixos/modules/services/networking/yggdrasil.nix

+8 −1
Original line number Diff line number Diff line
@@ -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 = {

nixos/tests/yggdrasil.nix

+1 −0
Original line number Diff line number Diff line
@@ -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;