commit 99f759de1c6c943fd747afd8fb896a0d65ae4ed8 · pyrox.dev/nixpkgs

+1 -3

nixos/modules/config/networking.nix

···

       9
       9
        
         cfg = config.networking;

     

       10
       10
        
         dnsmasqResolve = config.services.dnsmasq.enable &&

     

       11
       11
        
                          config.services.dnsmasq.resolveLocalQueries;

     

       12
       12
       -
         bindResolve =    config.services.bind.enable &&

     

       13
       13
       -
                          config.services.bind.resolveLocalQueries;

     

       14
       14
       -
         hasLocalResolver = bindResolve || dnsmasqResolve;

     

       12
       12
       +
         hasLocalResolver = config.services.bind.enable || dnsmasqResolve;

     

       15
       13
        
       

     

       16
       14
        
         resolvconfOptions = cfg.resolvconfOptions

     

       17
       15
        
           ++ optional cfg.dnsSingleRequest "single-request"

-9

nixos/modules/services/networking/bind.nix

···

       151
       151
        
               ";

     

       152
       152
        
             };

     

       153
       153
        
       

     

       154
       154
       -
             resolveLocalQueries = mkOption {

     

       155
       155
       -
               type = types.bool;

     

       156
       156
       -
               default = true;

     

       157
       157
       -
               description = ''

     

       158
       158
       -
                 Whether bind should resolve local queries (i.e. add 127.0.0.1 to

     

       159
       159
       -
                 /etc/resolv.conf, overriding networking.nameserver).

     

       160
       160
       -
               '';

     

       161
       161
       -
             };

     

       162
       162
       -
       

     

       163
       154
        
           };

     

       164
       155
        
       

     

       165
       156
        
         };

+1 -1

nixos/modules/services/networking/dnsmasq.nix

···

       42
       42
        
               default = true;

     

       43
       43
        
               description = ''

     

       44
       44
        
                 Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to

     

       45
       45
       -
                 /etc/resolv.conf overriding networking.nameservers).

     

       45
       45
       +
                 /etc/resolv.conf).

     

       46
       46
        
               '';

     

       47
       47
        
             };

     

       48
       48

+1 -1

nixos/modules/tasks/network-interfaces-scripted.nix

···

       105
       105
        
                     ''

     

       106
       106
        
                       # Set the static DNS configuration, if given.

     

       107
       107
        
                       ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <<EOF

     

       108
       108
       -
                       ${optionalString (cfg.domain != null) ''

     

       108
       108
       +
                       ${optionalString (cfg.nameservers != [] && cfg.domain != null) ''

     

       109
       109
        
                         domain ${cfg.domain}

     

       110
       110
        
                       ''}

     

       111
       111
        
                       ${optionalString (cfg.search != []) ("search " + concatStringsSep " " cfg.search)}