summary refs log tree commit diff
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-25 00:11:46 +0400
committerNikolay Amiantov <ab@fmap.me>2016-04-25 00:11:46 +0400
commit648f1c422be76b4dffb09be22b90ecf87aa8ea70 (patch)
treeb6cf5dbd0c5ce0ab161eb42d9dbbab82e03a08d8
parentfe5f52599bff0f7dda5846da68c4dc86fa19b98a (diff)
parent23e3cbeca4331507f4c54a4020b6573d89883480 (diff)
downloadnixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar.gz
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar.bz2
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar.lz
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar.xz
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.tar.zst
nixpkgs-648f1c422be76b4dffb09be22b90ecf87aa8ea70.zip
Merge pull request #14959 from dguibert/kerberos_server
kerberos_server: fix evaluation (closes #14928)
-rw-r--r--nixos/modules/services/system/kerberos.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/system/kerberos.nix b/nixos/modules/services/system/kerberos.nix
index 347302c6090..4f2e2fdf662 100644
--- a/nixos/modules/services/system/kerberos.nix
+++ b/nixos/modules/services/system/kerberos.nix
@@ -4,7 +4,7 @@ let
 
   inherit (lib) mkOption mkIf singleton;
 
-  inherit (pkgs) heimdal;
+  inherit (pkgs) heimdalFull;
 
   stateDir = "/var/heimdal";
 in
@@ -33,7 +33,7 @@ in
 
   config = mkIf config.services.kerberos_server.enable {
 
-    environment.systemPackages = [ heimdal ];
+    environment.systemPackages = [ heimdalFull ];
 
     services.xinetd.enable = true;
     services.xinetd.services = lib.singleton
@@ -42,7 +42,7 @@ in
         protocol = "tcp";
         user = "root";
         server = "${pkgs.tcp_wrappers}/sbin/tcpd";
-        serverArgs = "${pkgs.heimdal}/sbin/kadmind";
+        serverArgs = "${pkgs.heimdalFull}/sbin/kadmind";
       };
 
     systemd.services.kdc = {
@@ -51,13 +51,13 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
       '';
-      script = "${heimdal}/sbin/kdc";
+      script = "${heimdalFull}/sbin/kdc";
     };
 
     systemd.services.kpasswdd = {
       description = "Kerberos Password Changing daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${heimdal}/sbin/kpasswdd";
+      script = "${heimdalFull}/sbin/kpasswdd";
     };
   };