diff options
author | Florian Klink <flokli@flokli.de> | 2020-06-05 11:50:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-05 11:50:25 +0200 |
commit | c055fc0319516db454839653df630307335aebf1 (patch) | |
tree | 487bffebae8232dfe45218aa7ec9e2edebee9a91 /nixos/modules/services | |
parent | c9057b3751a604ba009a85acc45dde06c919886e (diff) | |
parent | 1fd972bd50590f96032f46daf15941d836bc95f4 (diff) | |
download | nixlib-c055fc0319516db454839653df630307335aebf1.tar nixlib-c055fc0319516db454839653df630307335aebf1.tar.gz nixlib-c055fc0319516db454839653df630307335aebf1.tar.bz2 nixlib-c055fc0319516db454839653df630307335aebf1.tar.lz nixlib-c055fc0319516db454839653df630307335aebf1.tar.xz nixlib-c055fc0319516db454839653df630307335aebf1.tar.zst nixlib-c055fc0319516db454839653df630307335aebf1.zip |
Merge pull request #89510 from flokli/buildbot-pbPort
nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/continuous-integration/buildbot/master.nix | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index e3da3092d459..0185f490b0c2 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -16,7 +16,7 @@ let factory = util.BuildFactory() c = BuildmasterConfig = dict( workers = [${concatStringsSep "," cfg.workers}], - protocols = { 'pb': {'port': ${toString cfg.bpPort} } }, + protocols = { 'pb': {'port': ${toString cfg.pbPort} } }, title = '${escapeStr cfg.title}', titleURL = '${escapeStr cfg.titleUrl}', buildbotURL = '${escapeStr cfg.buildbotUrl}', @@ -155,10 +155,20 @@ in { description = "Specifies the Buildbot directory."; }; - bpPort = mkOption { + pbPort = mkOption { default = 9989; - type = types.int; - description = "Port where the master will listen to Buildbot Worker."; + type = types.either types.str types.int; + 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 { @@ -264,5 +274,9 @@ in { }; }; + imports = [ + (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) + ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; } |