tomprince

diff --git a/contrib/build-installer b/contrib/build-installer
index 47f4c6b..8c7b5eb 100755
--- a/contrib/build-installer
+++ b/contrib/build-installer
@@ -40,18 +40,17 @@ tmpdir = None
 try:
     # Create a temporary working directory
     tmpdir = tempfile.mkdtemp()
+    get_pip = os.path.join(tmpdir, "get-pip.py")
 

tomprince

diff --git a/contrib/build-installer b/contrib/build-installer
index 47f4c6b..b350969 100755
--- a/contrib/build-installer
+++ b/contrib/build-installer
@@ -40,18 +40,18 @@ tmpdir = None
 try:
     # Create a temporary working directory
     tmpdir = tempfile.mkdtemp()
+    get_pip = os.path.join(tmpdir, "get-pip.py")
 

tomprince

diff --git a/src/hybridcluster/awesomeproxy/worker.py b/src/hybridcluster/awesomeproxy/worker.py
index 8741197..c6b55f5 100644
--- a/src/hybridcluster/awesomeproxy/worker.py
+++ b/src/hybridcluster/awesomeproxy/worker.py
@@ -1671,9 +1671,10 @@ class Controller(hybridcluster.mixins.ReceiveCurrentMasters, pb.Root):
         if isinstance(filesystem, basestring):
             if site:
                 match = aliasMatch(self.websiteAliases, site)
-                if match:
-                    return self._checkCurrentMastersJails(

tomprince

diff --git a/master/master.cfg b/master/master.cfg
index cd052c1..7c9f43e 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -191,6 +191,7 @@ builders.append({
         'name': 'pyflakes',
         'builddir': 'pyflakes',
         'factory': PyFlakesBuildFactory(git_update),
+        'env': {'PYFLAKES_NODOCTEST': '1'},
         'category': 'supported'})

tomprince

diff --git a/hlbb/zulip_status.py b/hlbb/zulip_status.py
index f37f978..b91c573 100644
--- a/hlbb/zulip_status.py
+++ b/hlbb/zulip_status.py
@@ -92,6 +92,14 @@ class _ZulipWriteOnlyStatus(StatusReceiverService):
         self.zulip = zulip
 
 
+    def startService(self):
+        self.parent.subscribe(self)

tomprince

from twisted.web import twcgi, static

resource = smoke_ping_htdocs = static.File("/var/www/localhost/smokeping")
smoke_ping_cgi = twcgi.CGIScript('/usr/bin/smokeping_cgi')
smoke_ping_images = static.File("/var/lib/smokeping/.simg")

smoke_ping_htdocs.putChild("", smoke_ping_cgi) 
smoke_ping_htdocs.putChild("smokeping", smoke_ping_cgi) 
smoke_ping_htdocs.putChild("images", smoke_ping_images) 

tomprince

diff --git a/src/hybridcluster/publicapi.py b/src/hybridcluster/publicapi.py
index eba0d9f..6c931c9 100644
--- a/src/hybridcluster/publicapi.py
+++ b/src/hybridcluster/publicapi.py
@@ -103,9 +103,11 @@ class PublicAPI(object):
         given sitejuggler.
         """
         portal = Portal(_Realm(), [AllowAnonymousAccess()])
+        root = Resource()
         guarded = HTTPAuthSessionWrapper(portal, [])

tomprince

from twisted.web import twcgi, static

class PHPScript(twcgi.FilteredScript):
	filter = "/usr/bin/php-cgi"

resource = static.File("/usr/share/webapps/ganglia-web/3.5.2/htdocs/")
resource.processors = {
	'.php': PHPScript,
}
resource.directoryListing = lambda : resource.getChild("index.php", None)

tomprince

diff --git a/src/hybridcluster/yakd.py b/src/hybridcluster/yakd.py
index 6c7b586..fb5f10a 100755
--- a/src/hybridcluster/yakd.py
+++ b/src/hybridcluster/yakd.py
@@ -546,8 +546,6 @@ class BindConfigurator:
         aliasToMaster.update(masterExtras)
         sites.extend(siteAliases)
 
-        zones = self._zonesFromWebsites(sites)
-

tomprince

from twisted.web.resource import Resource
from twisted.internet.task import LoopingCall

class R(Resource):
    isLeaf = True
    def getChild(self, *args):
        return self
    def render(self, req):
        def call():
            req.write("HELLO\r\n")