From: Brian Warner <warner@lothar.com>
Date: Fri, 1 Dec 2006 02:38:38 +0000 (-0700)
Subject: change manhole setup for queen too
X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~524
X-Git-Url: https://git.rkrishnan.org/simplejson/provisioning?a=commitdiff_plain;h=d2d0c6a06e48b680d0668901207b7d9425ba6f01;p=tahoe-lafs%2Ftahoe-lafs.git

change manhole setup for queen too
---

diff --git a/allmydata/queen.py b/allmydata/queen.py
index 849425d5..42d10333 100644
--- a/allmydata/queen.py
+++ b/allmydata/queen.py
@@ -43,7 +43,6 @@ class Roster(service.MultiService, Referenceable):
 class Queen(service.MultiService):
     CERTFILE = "queen.pem"
     PORTNUMFILE = "queen.port"
-    AUTHKEYSFILE = "authorized_keys"
 
     def __init__(self):
         service.MultiService.__init__(self)
@@ -63,11 +62,15 @@ class Queen(service.MultiService):
         # any services with the Tub until after that point
         self.tub.setServiceParent(self)
         self.urls = {}
-        if os.path.exists(self.AUTHKEYSFILE):
-            from allmydata import manhole
-            m = manhole.AuthorizedKeysManhole(8021, self.AUTHKEYSFILE)
-            m.setServiceParent(self)
-            log.msg("AuthorizedKeysManhole listening on 8021")
+
+        AUTHKEYSFILEBASE = "authorized_keys."
+        for f in os.listdir("."):
+            if f.startswith(AUTHKEYSFILEBASE):
+                portnum = int(f[len(AUTHKEYSFILEBASE):])
+                from allmydata import manhole
+                m = manhole.AuthorizedKeysManhole(portnum, f)
+                m.setServiceParent(self)
+                log.msg("AuthorizedKeysManhole listening on %d" % portnum)
 
     def _setup_tub(self, local_ip):
         l = self.tub.getListeners()[0]