commit dca7e24a11940477f6a3568fc49bade96ca59514 · pyrox.dev/nixpkgs

+66 -19

nixos/modules/services/networking/networkmanager.nix

···

       9
       9
        
         # /var/lib/misc is for dnsmasq.leases.

     

       10
       10
        
         stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";

     

       11
       11
        
       

     

       12
       12
       -
         dns =

     

       13
       13
       -
           if cfg.dns == "none" then "none"

     

       14
       14
       -
           else if cfg.dns == "dnsmasq" then "dnsmasq"

     

       15
       15
       -
           else if config.services.resolved.enable then "systemd-resolved"

     

       16
       16
       -
           else if config.services.unbound.enable then "unbound"

     

       17
       17
       -
           else "default";

     

       18
       18
       -
       

     

       19
       12
        
         configFile = writeText "NetworkManager.conf" ''

     

       20
       13
        
           [main]

     

       21
       14
        
           plugins=keyfile

     

       22
       15
        
           dhcp=${cfg.dhcp}

     

       23
       23
       -
           dns=${dns}

     

       16
       16
       +
           dns=${cfg.dns}

     

       24
       17
        
       

     

       25
       18
        
           [keyfile]

     

       26
       19
        
           ${optionalString (cfg.unmanaged != [])

     
···

       217
       210
        
             };

     

       218
       211
        
       

     

       219
       212
        
             dns = mkOption {

     

       220
       220
       -
               type = types.enum [ "auto" "dnsmasq" "none" ];

     

       221
       221
       -
               default = "auto";

     

       213
       213
       +
               type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ];

     

       214
       214
       +
               default = "default";

     

       222
       215
        
               description = ''

     

       216
       216
       +
                 Set the DNS (<literal>resolv.conf</literal>) processing mode.

     

       217
       217
       +
                 </para>

     

       218
       218
       +
                 <para>

     

       223
       219
        
                 Options:

     

       224
       224
       -
                   - auto: Check for systemd-resolved, unbound, or use default.

     

       225
       225
       -
                   - dnsmasq:

     

       226
       226
       -
                     Enable NetworkManager's dnsmasq integration. NetworkManager will run

     

       227
       227
       -
                     dnsmasq as a local caching nameserver, using a "split DNS"

     

       228
       228
       -
                     configuration if you are connected to a VPN, and then update

     

       229
       229
       -
                     resolv.conf to point to the local nameserver.

     

       230
       230
       -
                   - none:

     

       231
       231
       -
                     Disable NetworkManager's DNS integration completely.

     

       232
       232
       -
                     It will not touch your /etc/resolv.conf.

     

       220
       220
       +
                 <variablelist>

     

       221
       221
       +
                 <varlistentry>

     

       222
       222
       +
                   <term><literal>"default"</literal></term>

     

       223
       223
       +
                   <listitem><para>

     

       224
       224
       +
                     NetworkManager will update <literal>/etc/resolv.conf</literal> to

     

       225
       225
       +
                     reflect the nameservers provided by currently active connections.

     

       226
       226
       +
                   </para></listitem>

     

       227
       227
       +
                 </varlistentry>

     

       228
       228
       +
                 <varlistentry>

     

       229
       229
       +
                   <term><literal>"dnsmasq"</literal></term>

     

       230
       230
       +
                   <listitem>

     

       231
       231
       +
                     <para>

     

       232
       232
       +
                       Enable NetworkManager's dnsmasq integration. NetworkManager will

     

       233
       233
       +
                       run dnsmasq as a local caching nameserver, using a "split DNS"

     

       234
       234
       +
                       configuration if you are connected to a VPN, and then update

     

       235
       235
       +
                       <literal>resolv.conf</literal> to point to the local nameserver.

     

       236
       236
       +
                     </para>

     

       237
       237
       +
                     <para>

     

       238
       238
       +
                       It is possible to pass custom options to the dnsmasq instance by

     

       239
       239
       +
                       adding them to files in the

     

       240
       240
       +
                       <literal>/etc/NetworkManager/dnsmasq.d/</literal> directory.

     

       241
       241
       +
                     </para>

     

       242
       242
       +
                     <para>

     

       243
       243
       +
                       When multiple upstream servers are available, dnsmasq will

     

       244
       244
       +
                       initially contact them in parallel and then use the fastest to

     

       245
       245
       +
                       respond, probing again other servers after some time.  This

     

       246
       246
       +
                       behavior can be modified passing the

     

       247
       247
       +
                       <literal>all-servers</literal> or <literal>strict-order</literal>

     

       248
       248
       +
                       options to dnsmasq (see the manual page for more details).

     

       249
       249
       +
                     </para>

     

       250
       250
       +
                     <para>

     

       251
       251
       +
                       Note that this option causes NetworkManager to launch and manage

     

       252
       252
       +
                       its own instance of the dnsmasq daemon, which is

     

       253
       253
       +
                       <emphasis>not</emphasis> the same as setting

     

       254
       254
       +
                       <literal>services.dnsmasq.enable = true;</literal>.

     

       255
       255
       +
                     </para>

     

       256
       256
       +
                   </listitem>

     

       257
       257
       +
                 </varlistentry>

     

       258
       258
       +
                 <varlistentry>

     

       259
       259
       +
                   <term><literal>"unbound"</literal></term>

     

       260
       260
       +
                   <listitem><para>

     

       261
       261
       +
                     NetworkManager will talk to unbound and dnssec-triggerd,

     

       262
       262
       +
                     providing a "split DNS" configuration with DNSSEC support.

     

       263
       263
       +
                     <literal>/etc/resolv.conf</literal> will be managed by

     

       264
       264
       +
                     dnssec-trigger daemon.

     

       265
       265
       +
                   </para></listitem>

     

       266
       266
       +
                 </varlistentry>

     

       267
       267
       +
                 <varlistentry>

     

       268
       268
       +
                   <term><literal>"systemd-resolved"</literal></term>

     

       269
       269
       +
                   <listitem><para>

     

       270
       270
       +
                     NetworkManager will push the DNS configuration to systemd-resolved.

     

       271
       271
       +
                   </para></listitem>

     

       272
       272
       +
                 </varlistentry>

     

       273
       273
       +
                 <varlistentry>

     

       274
       274
       +
                   <term><literal>"none"</literal></term>

     

       275
       275
       +
                   <listitem><para>

     

       276
       276
       +
                     NetworkManager will not modify resolv.conf.

     

       277
       277
       +
                   </para></listitem>

     

       278
       278
       +
                 </varlistentry>

     

       279
       279
       +
                 </variablelist>

     

       233
       280
        
               '';

     

       234
       281
        
             };

     

       235
       282

nixos/modules/services/networking/unbound.nix

···

       131
       131
        
             };

     

       132
       132
        
           };

     

       133
       133
        
       

     

       134
       134
       +
           # If networkmanager is enabled, ask it to interface with unbound.

     

       135
       135
       +
           networking.networkmanager.dns = "unbound";

     

       136
       136
       +
       

     

       134
       137
        
         };

     

       135
       138
        
       

     

       136
       139
        
       }

nixos/modules/system/boot/resolved.nix

···

       147
       147
        
             ${config.services.resolved.extraConfig}

     

       148
       148
        
           '';

     

       149
       149
        
       

     

       150
       150
       +
           # If networkmanager is enabled, ask it to interface with resolved.

     

       151
       151
       +
           networking.networkmanager.dns = "systemd-resolved";

     

       150
       152
        
         };

     

       151
       153
        
       

     

       152
       154
        
       }