commit 615db90f3db73ebe5bef1bab3f1fca90a6cbe521 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/misc/ids.nix

···

       212
       212
        
             sddm = 175;

     

       213
       213
        
             tss = 176;

     

       214
       214
        
             #memcached = 177; removed 2018-01-03

     

       215
       215
       -
             ntp = 179;

     

       215
       215
       +
             #ntp = 179; # dynamically allocated as of 2021-09-17

     

       216
       216
        
             zabbix = 180;

     

       217
       217
        
             #redis = 181; removed 2018-01-03

     

       218
       218
        
             #unifi = 183; dynamically allocated as of 2021-09-17

+6 -6

nixos/modules/services/networking/ntp/ntpd.nix

···

       10
       10
        
       

     

       11
       11
        
         stateDir = "/var/lib/ntp";

     

       12
       12
        
       

     

       13
       13
       -
         ntpUser = "ntp";

     

       14
       14
       -
       

     

       15
       13
        
         configFile = pkgs.writeText "ntp.conf" ''

     

       16
       14
        
           driftfile ${stateDir}/ntp.drift

     

       17
       15
        
       

     
···

       27
       25
        
           ${cfg.extraConfig}

     

       28
       26
        
         '';

     

       29
       27
        
       

     

       30
       30
       -
         ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";

     

       28
       28
       +
         ntpFlags = "-c ${configFile} -u ntp:ntp ${toString cfg.extraFlags}";

     

       31
       29
        
       

     

       32
       30
        
       in

     

       33
       31
        
       

     
···

       119
       117
        
       

     

       120
       118
        
           systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };

     

       121
       119
        
       

     

       122
       122
       -
           users.users.${ntpUser} =

     

       123
       123
       -
             { uid = config.ids.uids.ntp;

     

       120
       120
       +
           users.users.ntp =

     

       121
       121
       +
             { isSystemUser = true;

     

       122
       122
       +
               group = "ntp";

     

       124
       123
        
               description = "NTP daemon user";

     

       125
       124
        
               home = stateDir;

     

       126
       125
        
             };

     

       126
       126
       +
           users.groups.ntp = {};

     

       127
       127
        
       

     

       128
       128
        
           systemd.services.ntpd =

     

       129
       129
        
             { description = "NTP Daemon";

     
···

       135
       135
        
               preStart =

     

       136
       136
        
                 ''

     

       137
       137
        
                   mkdir -m 0755 -p ${stateDir}

     

       138
       138
       -
                   chown ${ntpUser} ${stateDir}

     

       138
       138
       +
                   chown ntp ${stateDir}

     

       139
       139
        
                 '';

     

       140
       140
        
       

     

       141
       141
        
               serviceConfig = {

+3 -1

nixos/modules/services/networking/ntp/openntpd.nix

···

       61
       61
        
           environment.etc."ntpd.conf".text = configFile;

     

       62
       62
        
       

     

       63
       63
        
           users.users.ntp = {

     

       64
       64
       -
             uid = config.ids.uids.ntp;

     

       64
       64
       +
             isSystemUser = true;

     

       65
       65
       +
             group = "ntp";

     

       65
       66
        
             description = "OpenNTP daemon user";

     

       66
       67
        
             home = "/var/empty";

     

       67
       68
        
           };

     

       69
       69
       +
           users.groups.ntp = {};

     

       68
       70
        
       

     

       69
       71
        
           systemd.services.openntpd = {

     

       70
       72
        
             description = "OpenNTP Server";