mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-26 23:27:29 +03:00
nixos/taskserver: Rename client.{allow,deny}
These values match against the client IDs only, so let's rename it to something that actually reflects that. Having client.cert in the same namespace also could lead to confusion, because the client.cert setting is for the *debugging* client only. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
04fa5dcdb8
commit
8b793d1916
@ -39,8 +39,8 @@ let
|
|||||||
|
|
||||||
# client
|
# client
|
||||||
${mkConfLine "client.cert" cfg.client.cert}
|
${mkConfLine "client.cert" cfg.client.cert}
|
||||||
${mkConfLine "client.allow" cfg.client.allow}
|
${mkConfLine "client.allow" cfg.allowedClientIDs}
|
||||||
${mkConfLine "client.deny" cfg.client.deny}
|
${mkConfLine "client.deny" cfg.disallowedClientIDs}
|
||||||
|
|
||||||
# server
|
# server
|
||||||
server = ${cfg.server.host}:${toString cfg.server.port}
|
server = ${cfg.server.host}:${toString cfg.server.port}
|
||||||
@ -196,45 +196,41 @@ in {
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
client = {
|
allowedClientIDs = mkOption {
|
||||||
|
type = with types; loeOf (either (enum ["all" "none"]) str);
|
||||||
|
default = [];
|
||||||
|
example = [ "[Tt]ask [2-9]+" ];
|
||||||
|
description = ''
|
||||||
|
A list of regular expressions that are matched against the reported
|
||||||
|
client id (such as <literal>task 2.3.0</literal>).
|
||||||
|
|
||||||
allow = mkOption {
|
The values <literal>all</literal> or <literal>none</literal> have
|
||||||
type = with types; loeOf (either (enum ["all" "none"]) str);
|
special meaning. Overidden by any entry in the option
|
||||||
default = [];
|
<option>services.taskserver.client.deny</option>.
|
||||||
example = [ "[Tt]ask [2-9]+" ];
|
'';
|
||||||
description = ''
|
};
|
||||||
A list of regular expressions that are matched against the reported
|
|
||||||
client id (such as <literal>task 2.3.0</literal>).
|
|
||||||
|
|
||||||
The values <literal>all</literal> or <literal>none</literal> have
|
disallowedClientIDs = mkOption {
|
||||||
special meaning. Overidden by any entry in the option
|
type = with types; loeOf (either (enum ["all" "none"]) str);
|
||||||
<option>services.taskserver.client.deny</option>.
|
default = [];
|
||||||
'';
|
example = [ "[Tt]ask [2-9]+" ];
|
||||||
};
|
description = ''
|
||||||
|
A list of regular expressions that are matched against the reported
|
||||||
|
client id (such as <literal>task 2.3.0</literal>).
|
||||||
|
|
||||||
cert = mkOption {
|
The values <literal>all</literal> or <literal>none</literal> have
|
||||||
type = types.nullOr types.path;
|
special meaning. Any entry here overrides these in
|
||||||
default = null;
|
<option>services.taskserver.client.allow</option>.
|
||||||
description = ''
|
'';
|
||||||
Fully qualified path of the client cert. This is used by the
|
};
|
||||||
<command>client</command> command.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
deny = mkOption {
|
|
||||||
type = with types; loeOf (either (enum ["all" "none"]) str);
|
|
||||||
default = [];
|
|
||||||
example = [ "[Tt]ask [2-9]+" ];
|
|
||||||
description = ''
|
|
||||||
A list of regular expressions that are matched against the reported
|
|
||||||
client id (such as <literal>task 2.3.0</literal>).
|
|
||||||
|
|
||||||
The values <literal>all</literal> or <literal>none</literal> have
|
|
||||||
special meaning. Any entry here overrides these in
|
|
||||||
<option>services.taskserver.client.allow</option>.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
|
client.cert = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
default = null;
|
||||||
|
description = ''
|
||||||
|
Fully qualified path of the client cert. This is used by the
|
||||||
|
<command>client</command> command.
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
server = {
|
server = {
|
||||||
|
Loading…
Reference in New Issue
Block a user