openntpd: Fixes

This commit is contained in:
William A. Kennington III 2015-02-04 17:30:22 -08:00
parent a9f1329d2d
commit 43d8b1ef3c
2 changed files with 7 additions and 5 deletions

View File

@ -5,10 +5,7 @@ with lib;
let
cfg = config.services.openntpd;
package = pkgs.openntpd.override {
privsepUser = "ntp";
privsepPath = "/var/empty";
};
package = pkgs.openntpd_nixos;
cfgFile = pkgs.writeText "openntpd.conf" ''
${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
@ -55,7 +52,7 @@ in
services.ntp.enable = mkForce false;
# Add ntpctl to the environment for status checking
environment.systemPackages = [ openntpd ];
environment.systemPackages = [ package ];
users.extraUsers = singleton {
name = "ntp";

View File

@ -2071,6 +2071,11 @@ let
openntpd = callPackage ../tools/networking/openntpd { };
openntpd_nixos = openntpd.override {
privsepUser = "ntp";
privsepPath = "/var/empty";
};
openobex = callPackage ../tools/bluetooth/openobex { };
openopc = callPackage ../tools/misc/openopc {