commit 824d2c92bd5780f6142bbb3ddff7663140deda17 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2103.xml

···

       372
       372
        
          </listitem>

     

       373
       373
        
          <listitem>

     

       374
       374
        
           <para>

     

       375
       375
       +
            The <literal>services.dnscrypt-proxy2</literal> module now takes the upstream's example configuration and updates it with the user's settings.

     

       376
       376
       +
       

     

       377
       377
       +
            An option has been added to restore the old behaviour if you prefer to declare the configuration from scratch.

     

       378
       378
       +
           </para>

     

       379
       379
       +
          </listitem>

     

       380
       380
       +
          <listitem>

     

       381
       381
       +
           <para>

     

       375
       382
        
            NixOS now defaults to the unified cgroup hierarchy (cgroupsv2).

     

       376
       383
        
            See the <link xlink:href="https://www.redhat.com/sysadmin/fedora-31-control-group-v2">Fedora Article for 31</link>

     

       377
       384
        
            for details on why this is desirable, and how it impacts containers.

+17 -1

nixos/modules/services/networking/dnscrypt-proxy2.nix

···

       27
       27
        
             default = {};

     

       28
       28
        
           };

     

       29
       29
        
       

     

       30
       30
       +
           upstreamDefaults = mkOption {

     

       31
       31
       +
             description = ''

     

       32
       32
       +
               Whether to base the config declared in <literal>services.dnscrypt-proxy2.settings</literal> on the upstream example config (<link xlink:href="https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml"/>)

     

       33
       33
       +
       

     

       34
       34
       +
               Disable this if you want to declare your dnscrypt config from scratch.

     

       35
       35
       +
             '';

     

       36
       36
       +
             type = types.bool;

     

       37
       37
       +
             default = true;

     

       38
       38
       +
           };

     

       39
       39
       +
       

     

       30
       40
        
           configFile = mkOption {

     

       31
       41
        
             description = ''

     

       32
       42
        
               Path to TOML config file. See: <link xlink:href="https://github.com/DNSCrypt/dnscrypt-proxy/blob/master/dnscrypt-proxy/example-dnscrypt-proxy.toml"/>

     
···

       38
       48
        
               json = builtins.toJSON cfg.settings;

     

       39
       49
        
               passAsFile = [ "json" ];

     

       40
       50
        
             } ''

     

       41
       41
       -
               ${pkgs.remarshal}/bin/json2toml < $jsonPath > $out

     

       51
       51
       +
               ${if cfg.upstreamDefaults then ''

     

       52
       52
       +
                 ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json

     

       53
       53
       +
                 ${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two

     

       54
       54
       +
               '' else ''

     

       55
       55
       +
                 cp $jsonPath config.json

     

       56
       56
       +
               ''}

     

       57
       57
       +
               ${pkgs.remarshal}/bin/json2toml < config.json > $out

     

       42
       58
        
             '';

     

       43
       59
        
             defaultText = literalExample "TOML file generated from services.dnscrypt-proxy2.settings";

     

       44
       60
        
           };