commit d73025a5fe56e765bcb82c0f3740958debeaf3ce · pyrox.dev/nixpkgs

+20 -22

nixos/modules/config/nsswitch.nix

···

       35
       35
        
       

     

       36
       36
        
         config = {

     

       37
       37
        
       

     

       38
       38
       -
           environment.etc =

     

       39
       39
       -
             [ # Name Service Switch configuration file.  Required by the C library.

     

       40
       40
       -
               # !!! Factor out the mdns stuff.  The avahi module should define

     

       41
       41
       -
               # an option used by this module.

     

       42
       42
       -
               { source = pkgs.writeText "nsswitch.conf"

     

       43
       43
       -
                   ''

     

       44
       44
       -
                     passwd:    files ldap

     

       45
       45
       -
                     group:     files ldap

     

       46
       46
       -
                     shadow:    files ldap

     

       47
       47
       -
                     hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname

     

       48
       48
       -
                     networks:  files dns

     

       49
       49
       -
                     ethers:    files

     

       50
       50
       -
                     services:  files

     

       51
       51
       -
                     protocols: files

     

       52
       52
       -
                   '';

     

       53
       53
       -
                 target = "nsswitch.conf";

     

       54
       54
       -
               }

     

       55
       55
       -
             ];

     

       38
       38
       +
           # Name Service Switch configuration file.  Required by the C

     

       39
       39
       +
           # library.  !!! Factor out the mdns stuff.  The avahi module

     

       40
       40
       +
           # should define an option used by this module.

     

       41
       41
       +
           environment.etc."nsswitch.conf".text =

     

       42
       42
       +
             ''

     

       43
       43
       +
               passwd:    files ldap

     

       44
       44
       +
               group:     files ldap

     

       45
       45
       +
               shadow:    files ldap

     

       46
       46
       +
               hosts:     files ${optionalString nssmdns "mdns_minimal [NOTFOUND=return]"} dns ${optionalString nssmdns "mdns"} ${optionalString nsswins "wins"} myhostname mymachines

     

       47
       47
       +
               networks:  files dns

     

       48
       48
       +
               ethers:    files

     

       49
       49
       +
               services:  files

     

       50
       50
       +
               protocols: files

     

       51
       51
       +
             '';

     

       56
       52
        
       

     

       57
       57
       -
           # Use nss-myhostname to ensure that our hostname always resolves to

     

       58
       58
       -
           # a valid IP address.  It returns all locally configured IP

     

       59
       59
       -
           # addresses, or ::1 and 127.0.0.2 as fallbacks.

     

       60
       60
       -
           system.nssModules = [ pkgs.systemd ];

     

       53
       53
       +
           # Systemd provides nss-myhostname to ensure that our hostname

     

       54
       54
       +
           # always resolves to a valid IP address.  It returns all locally

     

       55
       55
       +
           # configured IP addresses, or ::1 and 127.0.0.2 as

     

       56
       56
       +
           # fallbacks. Systemd also provides nss-mymachines to return IP

     

       57
       57
       +
           # addresses of local containers.

     

       58
       58
       +
           system.nssModules = [ config.systemd.package ];

     

       61
       59
        
       

     

       62
       60
        
         };

     

       63
       61
        
       }

+1 -1

nixos/modules/services/system/nscd.nix

···

       62
       62
        
                   mkdir -m 0755 -p /var/db/nscd

     

       63
       63
        
                 '';

     

       64
       64
        
       

     

       65
       65
       -
               restartTriggers = [ config.environment.etc.hosts.source ];

     

       65
       65
       +
               restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];

     

       66
       66
        
       

     

       67
       67
        
               serviceConfig =

     

       68
       68
        
                 { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}";