# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1325096871 28800
# Node ID 76b4f58df3ee6fcfdd65d762480aae6bf8908219
# Parent  2161425d0ab76747896700f1648f9cfa0d25c35b
* enable a public HTML waterfall; * try to add an irc bot

diff -r 2161425d0ab7 -r 76b4f58df3ee autobot/config.py
--- a/autobot/config.py	Wed Dec 28 10:05:48 2011 -0800
+++ b/autobot/config.py	Wed Dec 28 10:27:51 2011 -0800
@@ -23,7 +23,7 @@
         # get global information
         master = ':master:'
         self.master = self.section_dict(master)
-        for port, default in ('slaveport', 9010), ('htmlport', 8010):
+        for port, default in ('slaveport', 9010), ('htmlport', 8010), ('publichtmlport', 8011):
             self.master[port] = int(self.master.get(port) or default)
 
         # get section information
diff -r 2161425d0ab7 -r 76b4f58df3ee autobot/template.py
--- a/autobot/template.py	Wed Dec 28 10:05:48 2011 -0800
+++ b/autobot/template.py	Wed Dec 28 10:27:51 2011 -0800
@@ -50,7 +50,8 @@
             Variable('os', 'buildslave os (win, mac, linux)', os_type),
             Variable('passwd', 'buildslave password', default='passwd'),
             Variable('slaveport', 'port to talk to slaves on', default=9010, cast=int),
-            Variable('htmlport', 'port for waterfall display', default=8010, cast=int)]
+            Variable('htmlport', 'port for waterfall display', default=8010, cast=int),
+            Variable('publichtmlport', 'port for public waterfall display', default=8011, cast=int)]
 
     def pre(self, variables, output):
         factory = variables.get('factories')
diff -r 2161425d0ab7 -r 76b4f58df3ee autobot/template/master/master.cfg
--- a/autobot/template/master/master.cfg	Wed Dec 28 10:05:48 2011 -0800
+++ b/autobot/template/master/master.cfg	Wed Dec 28 10:27:51 2011 -0800
@@ -101,10 +101,23 @@
 c['status'] = []
 from buildbot.status import html
 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))
 
+# public waterfall
+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
+c['status'].append(words.IRC(host="irc.mozilla.org", nick="autobot",
+                             channels=["#ateam"]))
+
+
 ####### PROJECT IDENTITY
 c['projectName'] = "autobot"
 c['projectURL'] = "http://buildbot.sourceforge.net/"
diff -r 2161425d0ab7 -r 76b4f58df3ee autobot/template/master/master.ini
--- a/autobot/template/master/master.ini	Wed Dec 28 10:05:48 2011 -0800
+++ b/autobot/template/master/master.ini	Wed Dec 28 10:27:51 2011 -0800
@@ -3,6 +3,7 @@
 password  = {{passwd}}
 slaveport = {{slaveport}}
 htmlport  = {{htmlport}}
+publichtmlport = {{publichtmlport}}
 pollInterval = 30
 treeStableTimer = 30