public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't run ntpd as root.

Browse Source 
svn path=/nixos/trunk/; revision=7463
This commit is contained in:
Eelco Dolstra 2006-12-22 19:23:19 +00:00
parent f037f6fbd4
commit 2d605d7041
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration/upstart.nix
View File

@ -84,7 +84,7 @@ import ../upstart-jobs/gather.nix {
# NTP daemon. # NTP daemon.
++ optional ["services" "ntp" "enable"] ++ optional ["services" "ntp" "enable"]
(import ../upstart-jobs/ntpd.nix { (import ../upstart-jobs/ntpd.nix {
inherit (pkgs) ntp glibc pwdutils writeText; inherit (pkgs) ntp kernel module_init_tools glibc pwdutils writeText;
servers = config.get ["services" "ntp" "servers"]; servers = config.get ["services" "ntp" "servers"];
}) })

14
upstart-jobs/ntpd.nix
View File

@ -1,4 +1,4 @@
{ntp, glibc, pwdutils, writeText, servers}: {ntp, kernel, module_init_tools, glibc, pwdutils, writeText, servers}:
let let
@ -12,6 +12,8 @@ let
${toString (map (server: "server " + server + "\n") servers)} ${toString (map (server: "server " + server + "\n") servers)}
"; ";
ntpFlags = "-c ${config} -u ${ntpUser}:nogroup";
in in
{ {
@ -34,13 +36,15 @@ start script
mkdir -m 0755 -p ${stateDir} mkdir -m 0755 -p ${stateDir}
chown ${ntpUser} ${stateDir} chown ${ntpUser} ${stateDir}
date # Needed to run ntpd as an unprivileged user.
${ntp}/bin/ntpd -c ${config} -q -g export MODULE_DIR=${kernel}/lib/modules/
date ${module_init_tools}/sbin/modprobe capability
${ntp}/bin/ntpd -q -g ${ntpFlags}
end script end script
respawn ${ntp}/bin/ntpd -n -c ${config} respawn ${ntp}/bin/ntpd -n ${ntpFlags}
"; ";
} }