alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/buildbot-master: fix typo in services.buildbot-master.bpPort

Browse source 
It's pbPort, and it's also a connection string, meaning
listen-on-localhost is also possible. Provide an alias for the old
option name, so old configs still work.
This commit is contained in:
Florian Klink 2020-06-05 00:31:10 +02:00
parent d0af797a50
commit 1fd972bd50
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
nixos/modules/services/continuous-integration/buildbot/master.nix
View file

@ -16,7 +16,7 @@ let
factory = util.BuildFactory() factory = util.BuildFactory()
c = BuildmasterConfig = dict( c = BuildmasterConfig = dict(
workers = [${concatStringsSep "," cfg.workers}], workers = [${concatStringsSep "," cfg.workers}],
protocols = { 'pb': {'port': ${toString cfg.bpPort} } }, protocols = { 'pb': {'port': ${toString cfg.pbPort} } },
title = '${escapeStr cfg.title}', title = '${escapeStr cfg.title}',
titleURL = '${escapeStr cfg.titleUrl}', titleURL = '${escapeStr cfg.titleUrl}',
buildbotURL = '${escapeStr cfg.buildbotUrl}', buildbotURL = '${escapeStr cfg.buildbotUrl}',
@ -155,10 +155,20 @@ in {
description = "Specifies the Buildbot directory."; description = "Specifies the Buildbot directory.";
}; };
bpPort = mkOption { pbPort = mkOption {
default = 9989; default = 9989;
type = types.int; type = types.either types.str types.int;
description = "Port where the master will listen to Buildbot Worker."; example = "'tcp:9990:interface=127.0.0.1'";
description = ''
The buildmaster will listen on a TCP port of your choosing
for connections from workers.
It can also use this port for connections from remote Change Sources,
status clients, and debug tools.
This port should be visible to the outside world, and you’ll need to tell
your worker admins about your choice.
If put in (single) quotes, this can also be used as a connection string,
as defined in the <link xlink:href="https://twistedmatrix.com/documents/current/core/howto/endpoints.html">ConnectionStrings guide</link>.
'';
}; };
listenAddress = mkOption { listenAddress = mkOption {
@ -264,5 +274,9 @@ in {
}; };
}; };
imports = [
(mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ])
];
meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; meta.maintainers = with lib.maintainers; [ nand0p mic92 ];
} }