Merge pull request #13748 from zohl/misc

a few descriptions fixups
This commit is contained in:
Robin Gloster 2016-03-07 21:42:26 +01:00
commit bcfb3dd9c6
3 changed files with 8 additions and 10 deletions

View file

@ -32,7 +32,7 @@ in
kdc = mkOption { kdc = mkOption {
default = "kerberos.mit.edu"; default = "kerberos.mit.edu";
description = "Kerberos Domain Controller."; description = "Key Distribution Center";
}; };
kerberosAdminServer = mkOption { kerberosAdminServer = mkOption {

View file

@ -257,13 +257,11 @@ in
type = types.bool; type = types.bool;
default = true; default = true;
description = '' description = ''
If enabled, Nix will only download binaries from binary If enabled (the default), Nix will only download binaries from binary caches if
caches if they are cryptographically signed with any of the they are cryptographically signed with any of the keys listed in
keys listed in <option>nix.binaryCachePublicKeys</option>. If disabled, signatures are neither
<option>nix.binaryCachePublicKeys</option>. If disabled (the required nor checked, so it's strongly recommended that you use only
default), signatures are neither required nor checked, so trustworthy caches and https to prevent man-in-the-middle attacks.
it's strongly recommended that you use only trustworthy
caches and https to prevent man-in-the-middle attacks.
''; '';
}; };

View file

@ -46,7 +46,7 @@ in
}; };
systemd.services.kdc = { systemd.services.kdc = {
description = "Kerberos Domain Controller daemon"; description = "Key Distribution Center daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = '' preStart = ''
mkdir -m 0755 -p ${stateDir} mkdir -m 0755 -p ${stateDir}
@ -55,7 +55,7 @@ in
}; };
systemd.services.kpasswdd = { systemd.services.kpasswdd = {
description = "Kerberos Domain Controller daemon"; description = "Kerberos Password Changing daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
script = "${heimdal}/sbin/kpasswdd"; script = "${heimdal}/sbin/kpasswdd";
}; };