commit 300c5c98c6e1558ec977c0f6f0b8a8af71fbd0e8 · pyrox.dev/nixpkgs

+13 -6

nixos/modules/services/networking/yggdrasil.nix

···

       4
       4
        
         keysPath = "/var/lib/yggdrasil/keys.json";

     

       5
       5
        
       

     

       6
       6
        
         cfg = config.services.yggdrasil;

     

       7
       7
       -
         configProvided = cfg.config != { };

     

       7
       7
       +
         settingsProvided = cfg.settings != { };

     

       8
       8
        
         configFileProvided = cfg.configFile != null;

     

       9
       9
        
       

     

       10
       10
       +
         format = pkgs.formats.json { };

     

       10
       11
        
       in {

     

       12
       12
       +
         imports = [

     

       13
       13
       +
           (mkRenamedOptionModule

     

       14
       14
       +
             [ "services" "yggdrasil" "config" ]

     

       15
       15
       +
             [ "services" "yggdrasil" "settings" ])

     

       16
       16
       +
         ];

     

       17
       17
       +
       

     

       11
       18
        
         options = with types; {

     

       12
       19
        
           services.yggdrasil = {

     

       13
       20
        
             enable = mkEnableOption "the yggdrasil system service";

     

       14
       21
        
       

     

       15
       15
       -
             config = mkOption {

     

       16
       16
       -
               type = attrs;

     

       22
       22
       +
             settings = mkOption {

     

       23
       23
       +
               type = format.type;

     

       17
       24
        
               default = {};

     

       18
       25
        
               example = {

     

       19
       26
        
                 Peers = [

     
···

       138
       145
        
             wantedBy = [ "multi-user.target" ];

     

       139
       146
        
       

     

       140
       147
        
             preStart =

     

       141
       141
       -
               (if configProvided || configFileProvided || cfg.persistentKeys then

     

       148
       148
       +
               (if settingsProvided || configFileProvided || cfg.persistentKeys then

     

       142
       149
        
                 "echo "

     

       143
       150
        
       

     

       144
       144
       -
                 + (lib.optionalString configProvided

     

       145
       145
       -
                   "'${builtins.toJSON cfg.config}'")

     

       151
       151
       +
                 + (lib.optionalString settingsProvided

     

       152
       152
       +
                   "'${builtins.toJSON cfg.settings}'")

     

       146
       153
        
                 + (lib.optionalString configFileProvided "$(cat ${cfg.configFile})")

     

       147
       154
        
                 + (lib.optionalString cfg.persistentKeys "$(cat ${keysPath})")

     

       148
       155
        
                 + " | ${pkgs.jq}/bin/jq -s add | ${binYggdrasil} -normaliseconf -useconf"

+2 -2

nixos/tests/yggdrasil.nix

···

       42
       42
        
       

     

       43
       43
        
               services.yggdrasil = {

     

       44
       44
        
                 enable = true;

     

       45
       45
       -
                 config = {

     

       45
       45
       +
                 settings = {

     

       46
       46
        
                   Listen = ["tcp://0.0.0.0:12345"];

     

       47
       47
        
                   MulticastInterfaces = [ ];

     

       48
       48
        
                 };

     
···

       112
       112
        
               services.yggdrasil = {

     

       113
       113
        
                 enable = true;

     

       114
       114
        
                 denyDhcpcdInterfaces = [ "ygg0" ];

     

       115
       115
       -
                 config = {

     

       115
       115
       +
                 settings = {

     

       116
       116
        
                   IfTAPMode = true;

     

       117
       117
        
                   IfName = "ygg0";

     

       118
       118
        
                   MulticastInterfaces = [ "eth1" ];