kerberos_server: fix evaluation (closes #14928)

(cherry picked from commit 23e3cbeca4)
This commit is contained in:
David Guibert 2016-04-24 21:56:15 +02:00 committed by Joachim Fasting
parent 47f2bf34f7
commit 0c12babcfd
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4

View File

@ -4,7 +4,7 @@ let
inherit (lib) mkOption mkIf singleton; inherit (lib) mkOption mkIf singleton;
inherit (pkgs) heimdal; inherit (pkgs) heimdalFull;
stateDir = "/var/heimdal"; stateDir = "/var/heimdal";
in in
@ -33,7 +33,7 @@ in
config = mkIf config.services.kerberos_server.enable { config = mkIf config.services.kerberos_server.enable {
environment.systemPackages = [ heimdal ]; environment.systemPackages = [ heimdalFull ];
services.xinetd.enable = true; services.xinetd.enable = true;
services.xinetd.services = lib.singleton services.xinetd.services = lib.singleton
@ -42,7 +42,7 @@ in
protocol = "tcp"; protocol = "tcp";
user = "root"; user = "root";
server = "${pkgs.tcp_wrappers}/sbin/tcpd"; server = "${pkgs.tcp_wrappers}/sbin/tcpd";
serverArgs = "${pkgs.heimdal}/sbin/kadmind"; serverArgs = "${pkgs.heimdalFull}/sbin/kadmind";
}; };
systemd.services.kdc = { systemd.services.kdc = {
@ -51,13 +51,13 @@ in
preStart = '' preStart = ''
mkdir -m 0755 -p ${stateDir} mkdir -m 0755 -p ${stateDir}
''; '';
script = "${heimdal}/sbin/kdc"; script = "${heimdalFull}/sbin/kdc";
}; };
systemd.services.kpasswdd = { systemd.services.kpasswdd = {
description = "Kerberos Domain Controller daemon"; description = "Kerberos Domain Controller daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
script = "${heimdal}/sbin/kpasswdd"; script = "${heimdalFull}/sbin/kpasswdd";
}; };
}; };