JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/taskserver: Rename server.{host,port}

Browse Source 
Having an option called services.taskserver.server.host is quite
confusing because we already have "server" in the service name, so let's
first get rid of the listening options before we rename the rest of the
options in that .server attribute.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2016-04-11 12:26:34 +02:00
parent 636e0e552d
commit d6bd457d1f
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ let
${mkConfLine "client.deny" cfg.disallowedClientIDs}
# server
server = ${cfg.server.host}:${toString cfg.server.port}
server = ${cfg.listenHost}:${toString cfg.listenPort}
${mkConfLine "server.crl" cfg.server.crl}
# certificates
@ -245,23 +245,23 @@ in {
'';
};
listenHost = mkOption {
type = types.str;
default = "localhost";
description = ''
The address (IPv4, IPv6 or DNS) to listen on.
'';
};
listenPort = mkOption {
type = types.int;
default = 53589;
description = ''
Port number of the Taskserver.
'';
};
server = {
host = mkOption {
type = types.str;
default = "localhost";
description = ''
The address (IPv4, IPv6 or DNS) to listen on.
'';
};
port = mkOption {
type = types.int;
default = 53589;
description = ''
Port number of the Taskserver.
'';
};
fqdn = mkOption {
type = types.str;
default = "localhost";

4
nixos/tests/taskserver.nix
View File

@ -5,7 +5,7 @@ import ./make-test.nix {
server = {
networking.firewall.enable = false;
services.taskserver.enable = true;
services.taskserver.server.host = "::";
services.taskserver.listenHost = "::";
services.taskserver.server.fqdn = "server";
services.taskserver.organisations = {
testOrganisation.users = [ "alice" "foo" ];
@ -27,7 +27,7 @@ import ./make-test.nix {
testScript = { nodes, ... }: let
cfg = nodes.server.config.services.taskserver;
portStr = toString cfg.server.port;
portStr = toString cfg.listenPort;
in ''
sub su ($$) {
my ($user, $cmd) = @_;