commit b3c423757e9f574ed51e1e5f01c7dfa1777def97 · pyrox.dev/nixpkgs

nixos/modules/misc/ids.nix

···

       213
       213
        
             zope2 = 185;

     

       214
       214
        
             ripple-data-api = 186;

     

       215
       215
        
             mediatomb = 187;

     

       216
       216
       +
             rdnssd = 188;

     

       216
       217
        
       

     

       217
       218
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       218
       219
        
       

     
···

       403
       404
        
             #zope2 = 185; # unused

     

       404
       405
        
             #ripple-data-api = 186; #unused

     

       405
       406
        
             mediatomb = 187;

     

       407
       407
       +
             #rdnssd = 188; # unused

     

       406
       408
        
       

     

       407
       409
        
             # When adding a gid, make sure it doesn't match an existing

     

       408
       410
        
             # uid. Users and groups with the same name should have equal

+35 -9

nixos/modules/services/networking/rdnssd.nix

···

       4
       4
        
       { config, lib, pkgs, ... }:

     

       5
       5
        
       

     

       6
       6
        
       with lib;

     

       7
       7
       -
       

     

       7
       7
       +
       let

     

       8
       8
       +
         mergeHook = pkgs.writeScript "rdnssd-merge-hook" ''

     

       9
       9
       +
           #! ${pkgs.stdenv.shell} -e

     

       10
       10
       +
           ${pkgs.openresolv}/bin/resolvconf -u

     

       11
       11
       +
         '';

     

       12
       12
       +
       in

     

       8
       13
        
       {

     

       9
       14
        
       

     

       10
       15
        
         ###### interface

     
···

       30
       35
        
       

     

       31
       36
        
         config = mkIf config.services.rdnssd.enable {

     

       32
       37
        
       

     

       33
       33
       -
           jobs.rdnssd =

     

       34
       34
       -
             { description = "RDNSS daemon";

     

       38
       38
       +
           systemd.services.rdnssd = {

     

       39
       39
       +
             description = "RDNSS daemon";

     

       40
       40
       +
             after = [ "network.target" ];

     

       41
       41
       +
             wantedBy = [ "multi-user.target" ];

     

       35
       42
        
       

     

       36
       36
       -
               # Start before the network interfaces are brought up so that

     

       37
       37
       -
               # the daemon receives RDNSS advertisements from the kernel.

     

       38
       38
       -
               startOn = "starting network-interfaces";

     

       43
       43
       +
             preStart = ''

     

       44
       44
       +
               # Create the proper run directory

     

       45
       45
       +
               mkdir -p /run/rdnssd

     

       46
       46
       +
               touch /run/rdnssd/resolv.conf

     

       47
       47
       +
               chown -R rdnssd /run/rdnssd

     

       39
       48
        
       

     

       40
       40
       -
               # !!! Should write to /var/run/rdnssd/resolv.conf and run the daemon under another uid.

     

       41
       41
       -
               exec = "${pkgs.ndisc6}/sbin/rdnssd --resolv-file /etc/resolv.conf -u root";

     

       49
       49
       +
               # Link the resolvconf interfaces to rdnssd

     

       50
       50
       +
               rm -f /run/resolvconf/interfaces/rdnssd

     

       51
       51
       +
               ln -s /run/rdnssd/resolv.conf /run/resolvconf/interfaces/rdnssd

     

       52
       52
       +
               ${mergeHook}

     

       53
       53
       +
             '';

     

       42
       54
        
       

     

       43
       43
       -
               daemonType = "fork";

     

       55
       55
       +
             postStop = ''

     

       56
       56
       +
               rm -f /run/resolvconf/interfaces/rdnssd

     

       57
       57
       +
               ${mergeHook}

     

       58
       58
       +
             '';

     

       59
       59
       +
       

     

       60
       60
       +
             serviceConfig = {

     

       61
       61
       +
               ExecStart = "@${pkgs.ndisc6}/bin/rdnssd rdnssd -p /run/rdnssd/rdnssd.pid -r /run/rdnssd/resolv.conf -u rdnssd -H ${mergeHook}";

     

       62
       62
       +
               Type = "forking";

     

       63
       63
       +
               PIDFile = "/run/rdnssd/rdnssd.pid";

     

       44
       64
        
             };

     

       65
       65
       +
           };

     

       66
       66
       +
       

     

       67
       67
       +
           users.extraUsers.rdnssd = {

     

       68
       68
       +
             description = "RDNSSD Daemon User";

     

       69
       69
       +
             uid = config.ids.uids.rdnssd;

     

       70
       70
       +
           };

     

       45
       71
        
       

     

       46
       72
        
         };

     

       47
       73