diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-11 12:26:34 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-11 12:26:34 +0200 |
commit | d6bd457d1f5514468a34c32e54076d0cf5a02122 (patch) | |
tree | e973aa4e25665f7920e1fe4594fb08fa8a5dc65a /nixos/modules/services/misc/taskserver | |
parent | 636e0e552d7084c0a3b09bf7cf2ad42f560e3819 (diff) | |
download | nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar.gz nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar.bz2 nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar.lz nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar.xz nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.tar.zst nixlib-d6bd457d1f5514468a34c32e54076d0cf5a02122.zip |
nixos/taskserver: Rename server.{host,port}
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>
Diffstat (limited to 'nixos/modules/services/misc/taskserver')
-rw-r--r-- | nixos/modules/services/misc/taskserver/default.nix | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 86eabb9bcfc8..8f760a4579d4 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -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 { ''; }; - server = { - host = mkOption { - type = types.str; - default = "localhost"; - description = '' - The address (IPv4, IPv6 or DNS) to listen on. - ''; - }; + listenHost = 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. - ''; - }; + listenPort = mkOption { + type = types.int; + default = 53589; + description = '' + Port number of the Taskserver. + ''; + }; + server = { fqdn = mkOption { type = types.str; default = "localhost"; |