nixos/ldap: minor cosmetic fixes

Changed files
+9 -13
nixos
modules
config
+9 -13
nixos/modules/config/ldap.nix
···
users.ldap = {
-
enable = mkOption {
-
type = types.bool;
-
default = false;
-
description = "Whether to enable authentication against an LDAP server.";
-
};
loginPam = mkOption {
type = types.bool;
default = true;
-
description = "Whether to include authentication against LDAP in login PAM";
};
nsswitch = mkOption {
type = types.bool;
default = true;
-
description = "Whether to include lookup against LDAP in NSS";
};
server = mkOption {
···
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
-
the end of the nslcd configuration file (nslcd.conf).
'' ;
} ;
···
description = ''
Specifies the time limit (in seconds) to use when connecting
to the directory server. This is distinct from the time limit
-
specified in <literal>users.ldap.timeLimit</literal> and affects
the initial server connection only.
'';
};
···
actually contact the directory server, and it is possible that
a malformed configuration file will trigger reconnection. If
<literal>soft</literal> is specified, then
-
<literal>nss_ldap</literal> will return immediately on server
failure. All hard reconnect policies block with exponential
backoff before retrying.
'';
···
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
-
the end of the ldap configuration file (ldap.conf).
-
If <literal>users.ldap.daemon</literal> is enabled, this
configuration will not be used. In that case, use
-
<literal>users.ldap.daemon.extraConfig</literal> instead.
'' ;
};
···
users.ldap = {
+
enable = mkEnableOption "authentication against an LDAP server";
loginPam = mkOption {
type = types.bool;
default = true;
+
description = "Whether to include authentication against LDAP in login PAM.";
};
nsswitch = mkOption {
type = types.bool;
default = true;
+
description = "Whether to include lookup against LDAP in NSS.";
};
server = mkOption {
···
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
+
the end of the nslcd configuration file (<literal>nslcd.conf(5)</literal>).
'' ;
} ;
···
description = ''
Specifies the time limit (in seconds) to use when connecting
to the directory server. This is distinct from the time limit
+
specified in <option>users.ldap.timeLimit</option> and affects
the initial server connection only.
'';
};
···
actually contact the directory server, and it is possible that
a malformed configuration file will trigger reconnection. If
<literal>soft</literal> is specified, then
+
<package>nss_ldap</package> will return immediately on server
failure. All hard reconnect policies block with exponential
backoff before retrying.
'';
···
type = types.lines;
description = ''
Extra configuration options that will be added verbatim at
+
the end of the ldap configuration file (<literal>ldap.conf(5)</literal>).
+
If <option>users.ldap.daemon</option> is enabled, this
configuration will not be used. In that case, use
+
<option>users.ldap.daemon.extraConfig</option> instead.
'' ;
};