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

openntpd: Fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/networking/openntpd.nix
View File

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

5
pkgs/top-level/all-packages.nix
View File

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