Ticket #162: pubhtml.patch

buildbot/buildbot/status/web/baseweb.py

@@ -311 +311 @@
-     /xmlrpc : (not yet implemented) an XMLRPC server with build status
-
-
-
-
-
+
+
+
+
-
-    If an index file (index.html, index.htm, or index, in that order) is
-public_html/
+PUBLIC_HTML
-    the default behavior is to put a redirection to the /waterfall page.
-
-    All of the resources provided by this service use relative URLs to reach
@@ -325 +326 @@
-    bottom.
-
-    This webserver defines class attributes on elements so they can be styled
-public_html
+PUBLIC_HTML
-    can cause additional stylesheets to be loaded by adding a suitable <link>
-    to the WebStatus instance's .head_elements attribute.
-
@@ -354 +355 @@
-    # not (we'd have to do a recursive traversal of all children to discover
-    # all the changes).
-
-
+
+
-        """Run a web server that provides Buildbot status.
-
-        @type  http_port: int or L{twisted.application.strports} string
@@ -387 +389 @@
-                             'unix:/home/buildbot/.twistd-web-pb'. Providing
-                             a non-absolute pathname will probably confuse
-                             the strports parser.
+
-        @param allowForce: boolean, if True then the webserver will allow
-                           visitors to trigger and cancel builds
+
+        @param public_html: the path to the public_html directory for this display,
+                            either absolute or relative to the basedir.  The default
+                            is 'public_html', which selects BASEDIR/public_html.
-        """
-
-        service.MultiService.__init__(self)
@@ -402 +409 @@
-                distrib_port = "unix:%s" % distrib_port
-        self.distrib_port = distrib_port
-        self.allowForce = allowForce
+        self.public_html = public_html
-
-        # this will be replaced once we've been attached to a parent (and
-/public_html/
+
-        root = static.Data("placeholder", "text/plain")
-        self.site = server.Site(root)
-        self.childrenToBeAdded = {}
@@ -462 +470 @@
-    def setupSite(self):
-        # this is responsible for creating the root resource. It isn't done
-        # at __init__ time because we need to reference the parent's basedir.
-join(self.parent.basedir, "public_html"
+abspath(os.path.join(self.parent.basedir, self.public_html)
-        if os.path.isdir(htmldir):
-            log.msg("WebStatus using (%s)" % htmldir)
-        else:
@@ -516 +524 @@
-# always redirects to a WaterfallStatusResource, and the old arguments are
-# mapped into the new resource-tree approach. In the normal WebStatus, the
-# root resource either redirects the browser to /waterfall or serves
-BASEDIR/public_html
-BASEDIR/public_html
+PUBLIC_HTML
+PUBLIC_HTML
-
-# note: we don't use a util.Redirect here because HTTP requires that the
-# Location: header provide an absolute URI, and it's non-trivial to figure