ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-27 07:37:47 +03:00
Code Issues Projects Releases Wiki Activity

nixos/taskserver: Rename client.{allow,deny}

Browse Source 
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:
aszlig 2016-04-07 13:20:20 +02:00
parent 04fa5dcdb8
commit 8b793d1916
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nixos/modules/services/misc/taskserver/default.nix
View File

@ -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,9 +196,7 @@ in {
''; '';
}; };
client = { allowedClientIDs = mkOption {
allow = mkOption {
type = with types; loeOf (either (enum ["all" "none"]) str); type = with types; loeOf (either (enum ["all" "none"]) str);
default = []; default = [];
example = [ "[Tt]ask [2-9]+" ]; example = [ "[Tt]ask [2-9]+" ];
@ -212,16 +210,7 @@ in {
''; '';
}; };
cert = mkOption { disallowedClientIDs = 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.
'';
};
deny = mkOption {
type = with types; loeOf (either (enum ["all" "none"]) str); type = with types; loeOf (either (enum ["all" "none"]) str);
default = []; default = [];
example = [ "[Tt]ask [2-9]+" ]; example = [ "[Tt]ask [2-9]+" ];
@ -235,6 +224,13 @@ in {
''; '';
}; };
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 = {