change manhole setup for queen too

This commit is contained in:
Brian Warner 2006-11-30 19:38:38 -07:00
parent 5daa74d1af
commit d2d0c6a06e

View File

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