Mercurial > hg > autobot
changeset 286:555c1c54be75
fun
| author | Jeff Hammel <jhammel@mozilla.com> |
|---|---|
| date | Mon, 25 Feb 2013 16:01:34 -0800 |
| parents | 29bbe1b9f51f |
| children | 3a4b11d4fdf0 |
| files | autobot/template/master/master.cfg |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/autobot/template/master/master.cfg Thu Aug 02 10:01:32 2012 -0700 +++ b/autobot/template/master/master.cfg Mon Feb 25 16:01:34 2013 -0800 @@ -127,14 +127,18 @@ from buildbot.status.web.authz import Authz # force-build-enabled waterfall -authz = Authz(forceBuild=True, stopBuild=True) -c['status'].append(html.WebStatus(http_port=config.master['htmlport'], - authz=authz)) +htmlport = config.master.get('htmlport') +if htmlport: + authz = Authz(forceBuild=True, stopBuild=True) + c['status'].append(html.WebStatus(http_port=config.master['htmlport'], + authz=authz)) # public waterfall -authz_public = Authz(forceBuild=False, stopBuild=False) -c['status'].append(html.WebStatus(http_port=config.master['publichtmlport'], - authz=authz_public)) +publichtmlport = config.master.get('publichtmlport') +if publichtmlport: + authz_public = Authz(forceBuild=False, stopBuild=False) + c['status'].append(html.WebStatus(http_port=config.master['publichtmlport'], + authz=authz_public)) # irc bot from buildbot.status import words @@ -142,7 +146,9 @@ if '@' in irc and config.master['channels']: nick, irc_host = irc.split('@', 1) if nick and irc_host: - c['status'].append(words.IRC(host=irc_host, nick=nick, + c['status'].append(words.IRC(host=irc_host, nick=nick, allowForce=False, + events={'success': 1, + }, channels=config.master['channels'])) # email notification; see @@ -169,4 +175,4 @@ ####### PROJECT IDENTITY c['projectName'] = "autobot" c['projectURL'] = "http://buildbot.sourceforge.net/" -c['buildbotURL'] = "http://{{domain}}:%d/" % config.master['htmlport'] +c['buildbotURL'] = "http://{{domain}}:%s/" % config.master.get('publichtmlport', 80)