commit 02a2649220887363e7730cfb2f0dcc3c4cf17f06 · pyrox.dev/nixpkgs

+18 -16

nixos/modules/config/krb5/default.nix

···

       41
       41
        
               value)

     

       42
       42
        
           else value;

     

       43
       43
        
       

     

       44
       44
       -
         mkIndent = depth: concatStrings (builtins.genList (_:  " ") (2 * depth));

     

       44
       44
       +
         indent = "  ";

     

       45
       45
        
       

     

       46
       46
       -
         mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";

     

       46
       46
       +
         mkRelation = name: value:

     

       47
       47
       +
           if (isList value) then

     

       48
       48
       +
             concatMapStringsSep "\n" (mkRelation name) value

     

       49
       49
       +
           else "${name} = ${mkVal value}";

     

       47
       50
        
       

     

       48
       48
       -
         mkVal = { value, depth ? 0 }:

     

       51
       51
       +
         mkVal = value:

     

       49
       52
        
           if (value == true) then "true"

     

       50
       53
        
           else if (value == false) then "false"

     

       51
       54
        
           else if (isInt value) then (toString value)

     

       52
       52
       -
           else if (isList value) then

     

       53
       53
       -
             concatMapStringsSep " " mkVal { inherit value depth; }

     

       54
       55
        
           else if (isAttrs value) then

     

       55
       55
       -
             (concatStringsSep "\n${mkIndent (depth + 1)}"

     

       56
       56
       -
               ([ "{" ] ++ (mapAttrsToList

     

       57
       57
       -
                 (attrName: attrValue: let

     

       58
       58
       -
                   mappedAttrValue = mkVal {

     

       59
       59
       -
                     value = attrValue;

     

       60
       60
       -
                     depth = depth + 1;

     

       61
       61
       -
                   };

     

       62
       62
       -
                 in "${attrName} = ${mappedAttrValue}")

     

       63
       63
       -
               value))) + "\n${mkIndent depth}}"

     

       56
       56
       +
             let configLines = concatLists

     

       57
       57
       +
               (map (splitString "\n")

     

       58
       58
       +
                 (mapAttrsToList mkRelation value));

     

       59
       59
       +
             in

     

       60
       60
       +
             (concatStringsSep "\n${indent}"

     

       61
       61
       +
               ([ "{" ] ++ configLines))

     

       62
       62
       +
             + "\n}"

     

       64
       63
        
           else value;

     

       65
       64
        
       

     

       66
       65
        
         mkMappedAttrsOrString = value: concatMapStringsSep "\n"

     

       67
       66
        
           (line: if builtins.stringLength line > 0

     

       68
       68
       -
             then "${mkIndent 1}${line}"

     

       67
       67
       +
             then "${indent}${line}"

     

       69
       68
        
             else line)

     

       70
       69
        
           (splitString "\n"

     

       71
       70
        
             (if isAttrs value then

     
···

       114
       113
        
                 {

     

       115
       114
        
                   "ATHENA.MIT.EDU" = {

     

       116
       115
        
                     admin_server = "athena.mit.edu";

     

       117
       117
       -
                     kdc = "athena.mit.edu";

     

       116
       116
       +
                     kdc = [

     

       117
       117
       +
                       "athena01.mit.edu"

     

       118
       118
       +
                       "athena02.mit.edu"

     

       119
       119
       +
                     ];

     

       118
       120
        
                   };

     

       119
       121
        
                 };

     

       120
       122
        
               '';

+6 -2

nixos/tests/krb5/example-config.nix

···

       18
       18
        
               realms = {

     

       19
       19
        
                 "ATHENA.MIT.EDU" = {

     

       20
       20
        
                   admin_server = "athena.mit.edu";

     

       21
       21
       -
                   kdc = "athena.mit.edu";

     

       21
       21
       +
                   kdc = [

     

       22
       22
       +
                     "athena01.mit.edu"

     

       23
       23
       +
                     "athena02.mit.edu"

     

       24
       24
       +
                   ];

     

       22
       25
        
                 };

     

       23
       26
        
               };

     

       24
       27
        
               domain_realm = {

     
···

       65
       68
        
             [realms]

     

       66
       69
        
               ATHENA.MIT.EDU = {

     

       67
       70
        
                 admin_server = athena.mit.edu

     

       68
       68
       -
                 kdc = athena.mit.edu

     

       71
       71
       +
                 kdc = athena01.mit.edu

     

       72
       72
       +
                 kdc = athena02.mit.edu

     

       69
       73
        
               }

     

       70
       74
        
       

     

       71
       75
        
             [domain_realm]