commit 022c7d777adf09ba2a6a9288d2b232e73b802ee8 · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2305.section.xml

···

       177
       177
        
             </listitem>

     

       178
       178
        
             <listitem>

     

       179
       179
        
               <para>

     

       180
       180
       +
                 The <literal>dnsmasq</literal> service now takes configuration

     

       181
       181
       +
                 via the <literal>services.dnsmasq.settings</literal> attribute

     

       182
       182
       +
                 set. The option

     

       183
       183
       +
                 <literal>services.dnsmasq.extraConfig</literal> will be

     

       184
       184
       +
                 deprecated when NixOS 22.11 reaches end of life.

     

       185
       185
       +
               </para>

     

       186
       186
       +
             </listitem>

     

       187
       187
       +
             <listitem>

     

       188
       188
       +
               <para>

     

       180
       189
        
                 A new <literal>virtualisation.rosetta</literal> module was

     

       181
       190
        
                 added to allow running <literal>x86_64</literal> binaries

     

       182
       191
        
                 through

nixos/doc/manual/release-notes/rl-2305.section.md

···

       53
       53
        
       

     

       54
       54
        
       - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables.

     

       55
       55
        
       

     

       56
       56
       +
       - The `dnsmasq` service now takes configuration via the

     

       57
       57
       +
         `services.dnsmasq.settings` attribute set. The option

     

       58
       58
       +
         `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches

     

       59
       59
       +
         end of life.

     

       60
       60
       +
       

     

       56
       61
        
       - A new `virtualisation.rosetta` module was added to allow running `x86_64` binaries through [Rosetta](https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment) inside virtualised NixOS guests on Apple silicon. This feature works by default with the [UTM](https://docs.getutm.app/) virtualisation [package](https://search.nixos.org/packages?channel=unstable&show=utm&from=0&size=1&sort=relevance&type=packages&query=utm).

     

       57
       62
        
       

     

       58
       63
        
       - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store.

+69 -17

nixos/modules/services/networking/dnsmasq.nix

···

       7
       7
        
         dnsmasq = pkgs.dnsmasq;

     

       8
       8
        
         stateDir = "/var/lib/dnsmasq";

     

       9
       9
        
       

     

       10
       10
       +
         # True values are just put as `name` instead of `name=true`, and false values

     

       11
       11
       +
         # are turned to comments (false values are expected to be overrides e.g.

     

       12
       12
       +
         # mkForce)

     

       13
       13
       +
         formatKeyValue =

     

       14
       14
       +
           name: value:

     

       15
       15
       +
           if value == true

     

       16
       16
       +
           then name

     

       17
       17
       +
           else if value == false

     

       18
       18
       +
           then "# setting `${name}` explicitly set to false"

     

       19
       19
       +
           else generators.mkKeyValueDefault { } "=" name value;

     

       20
       20
       +
       

     

       21
       21
       +
         settingsFormat = pkgs.formats.keyValue {

     

       22
       22
       +
           mkKeyValue = formatKeyValue;

     

       23
       23
       +
           listsAsDuplicateKeys = true;

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         # Because formats.generate is outputting a file, we use of conf-file. Once

     

       27
       27
       +
         # `extraConfig` is deprecated we can just use

     

       28
       28
       +
         # `dnsmasqConf = format.generate "dnsmasq.conf" cfg.settings`

     

       10
       29
        
         dnsmasqConf = pkgs.writeText "dnsmasq.conf" ''

     

       11
       11
       -
           dhcp-leasefile=${stateDir}/dnsmasq.leases

     

       12
       12
       -
           ${optionalString cfg.resolveLocalQueries ''

     

       13
       13
       -
             conf-file=/etc/dnsmasq-conf.conf

     

       14
       14
       -
             resolv-file=/etc/dnsmasq-resolv.conf

     

       15
       15
       -
           ''}

     

       16
       16
       -
           ${flip concatMapStrings cfg.servers (server: ''

     

       17
       17
       -
             server=${server}

     

       18
       18
       -
           '')}

     

       30
       30
       +
           conf-file=${settingsFormat.generate "dnsmasq.conf" cfg.settings}

     

       19
       31
        
           ${cfg.extraConfig}

     

       20
       32
        
         '';

     

       21
       33
        
       

     

       22
       34
        
       in

     

       23
       35
        
       

     

       24
       36
        
       {

     

       37
       37
       +
       

     

       38
       38
       +
         imports = [

     

       39
       39
       +
           (mkRenamedOptionModule [ "services" "dnsmasq" "servers" ] [ "services" "dnsmasq" "settings" "server" ])

     

       40
       40
       +
         ];

     

       25
       41
        
       

     

       26
       42
        
         ###### interface

     

       27
       43
        
       

     
···

       46
       62
        
               '';

     

       47
       63
        
             };

     

       48
       64
        
       

     

       49
       49
       -
             servers = mkOption {

     

       50
       50
       -
               type = types.listOf types.str;

     

       51
       51
       -
               default = [];

     

       52
       52
       -
               example = [ "8.8.8.8" "8.8.4.4" ];

     

       53
       53
       -
               description = lib.mdDoc ''

     

       54
       54
       -
                 The DNS servers which dnsmasq should query.

     

       55
       55
       -
               '';

     

       56
       56
       -
             };

     

       57
       57
       -
       

     

       58
       65
        
             alwaysKeepRunning = mkOption {

     

       59
       66
        
               type = types.bool;

     

       60
       67
        
               default = false;

     
···

       63
       70
        
               '';

     

       64
       71
        
             };

     

       65
       72
        
       

     

       73
       73
       +
             settings = mkOption {

     

       74
       74
       +
               type = types.submodule {

     

       75
       75
       +
       

     

       76
       76
       +
                 freeformType = settingsFormat.type;

     

       77
       77
       +
       

     

       78
       78
       +
                 options.server = mkOption {

     

       79
       79
       +
                   type = types.listOf types.str;

     

       80
       80
       +
                   default = [ ];

     

       81
       81
       +
                   example = [ "8.8.8.8" "8.8.4.4" ];

     

       82
       82
       +
                   description = lib.mdDoc ''

     

       83
       83
       +
                     The DNS servers which dnsmasq should query.

     

       84
       84
       +
                   '';

     

       85
       85
       +
                 };

     

       86
       86
       +
       

     

       87
       87
       +
               };

     

       88
       88
       +
               default = { };

     

       89
       89
       +
               description = lib.mdDoc ''

     

       90
       90
       +
                 Configuration of dnsmasq. Lists get added one value per line (empty

     

       91
       91
       +
                 lists and false values don't get added, though false values get

     

       92
       92
       +
                 turned to comments). Gets merged with

     

       93
       93
       +
       

     

       94
       94
       +
                     {

     

       95
       95
       +
                       dhcp-leasefile = "${stateDir}/dnsmasq.leases";

     

       96
       96
       +
                       conf-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf";

     

       97
       97
       +
                       resolv-file = optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf";

     

       98
       98
       +
                     }

     

       99
       99
       +
               '';

     

       100
       100
       +
               example = literalExpression ''

     

       101
       101
       +
                 {

     

       102
       102
       +
                   domain-needed = true;

     

       103
       103
       +
                   dhcp-range = [ "192.168.0.2,192.168.0.254" ];

     

       104
       104
       +
                 }

     

       105
       105
       +
               '';

     

       106
       106
       +
             };

     

       107
       107
       +
       

     

       66
       108
        
             extraConfig = mkOption {

     

       67
       109
        
               type = types.lines;

     

       68
       110
        
               default = "";

     

       69
       111
        
               description = lib.mdDoc ''

     

       70
       112
        
                 Extra configuration directives that should be added to

     

       71
       113
        
                 `dnsmasq.conf`.

     

       114
       114
       +
       

     

       115
       115
       +
                 This option is deprecated, please use {option}`settings` instead.

     

       72
       116
        
               '';

     

       73
       117
        
             };

     

       74
       118
        
       

     
···

       80
       124
        
         ###### implementation

     

       81
       125
        
       

     

       82
       126
        
         config = mkIf cfg.enable {

     

       127
       127
       +
       

     

       128
       128
       +
           warnings = lib.optional (cfg.extraConfig != "") "Text based config is deprecated, dnsmasq now supports `services.dnsmasq.settings` for an attribute-set based config";

     

       129
       129
       +
       

     

       130
       130
       +
           services.dnsmasq.settings = {

     

       131
       131
       +
             dhcp-leasefile = mkDefault "${stateDir}/dnsmasq.leases";

     

       132
       132
       +
             conf-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-conf.conf");

     

       133
       133
       +
             resolv-file = mkDefault (optional cfg.resolveLocalQueries "/etc/dnsmasq-resolv.conf");

     

       134
       134
       +
           };

     

       83
       135
        
       

     

       84
       136
        
           networking.nameservers =

     

       85
       137
        
             optional cfg.resolveLocalQueries "127.0.0.1";

+1 -1

nixos/tests/dnscrypt-proxy2.nix

···

       26
       26
        
             };

     

       27
       27
        
       

     

       28
       28
        
             services.dnsmasq.enable = true;

     

       29
       29
       -
             services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ];

     

       29
       29
       +
             services.dnsmasq.settings.server = [ "127.0.0.1#${toString localProxyPort}" ];

     

       30
       30
        
           };

     

       31
       31
        
         };

     

       32
       32

+1 -1

nixos/tests/kubernetes/dns.nix

···

       69
       69
        
         extraConfiguration = { config, pkgs, lib, ... }: {

     

       70
       70
        
           environment.systemPackages = [ pkgs.bind.host ];

     

       71
       71
        
           services.dnsmasq.enable = true;

     

       72
       72
       -
           services.dnsmasq.servers = [

     

       72
       72
       +
           services.dnsmasq.settings.server = [

     

       73
       73
        
             "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53"

     

       74
       74
        
           ];

     

       75
       75
        
         };

+1 -3

nixos/tests/schleuder.nix

···

       82
       82
        
           # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts

     

       83
       83
        
           services.dnsmasq = {

     

       84
       84
        
             enable = true;

     

       85
       85
       -
             extraConfig = ''

     

       86
       86
       -
               selfmx

     

       87
       87
       -
             '';

     

       85
       85
       +
             settings.selfmx = true;

     

       88
       86
        
           };

     

       89
       87
        
       

     

       90
       88
        
           networking.extraHosts = ''