diff options
Diffstat (limited to 'rpkid/rpki')
| -rw-r--r-- | rpkid/rpki/irdbd.py | 29 | ||||
| -rw-r--r-- | rpkid/rpki/pubd.py | 10 | ||||
| -rw-r--r-- | rpkid/rpki/rootd.py | 2 | ||||
| -rw-r--r-- | rpkid/rpki/rpkid.py | 2 |
4 files changed, 25 insertions, 18 deletions
diff --git a/rpkid/rpki/irdbd.py b/rpkid/rpki/irdbd.py index 4e9c6b5c..4da6f5e1 100644 --- a/rpkid/rpki/irdbd.py +++ b/rpkid/rpki/irdbd.py @@ -249,18 +249,25 @@ class main(object): rpki.left_right.list_roa_requests_elt : self.handle_list_roa_requests, rpki.left_right.list_ghostbuster_requests_elt : self.handle_list_ghostbuster_requests } - u = urlparse.urlparse(self.cfg.get("http-url")) - - assert u.scheme in ("", "http") and \ - u.username is None and \ - u.password is None and \ - u.params == "" and \ - u.query == "" and \ - u.fragment == "" + try: + self.http_server_host = self.cfg.get("server-host", "") + self.http_server_port = self.cfg.getint("server-port") + except: + # + # Backwards compatibility, remove this eventually. + # + u = urlparse.urlparse(self.cfg.get("http-url")) + if (u.scheme not in ("", "http") or + u.username is not None or + u.password is not None or + u.params or u.query or u.fragment): + raise + self.http_server_host = u.hostname + self.http_server_port = int(u.port) self.cms_timestamp = None rpki.http.server( - host = u.hostname or "localhost", - port = u.port or 443, - handlers = ((u.path, self.handler),)) + host = self.http_server_host, + port = self.http_server_port, + handlers = self.handler) diff --git a/rpkid/rpki/pubd.py b/rpkid/rpki/pubd.py index a5e0781f..7c5426bd 100644 --- a/rpkid/rpki/pubd.py +++ b/rpkid/rpki/pubd.py @@ -122,17 +122,17 @@ class main(object): self.pubd_key = rpki.x509.RSA( Auto_update = self.cfg.get("pubd-key")) self.http_server_host = self.cfg.get("server-host", "") - self.http_server_port = int(self.cfg.get("server-port", "4434")) + self.http_server_port = self.cfg.getint("server-port") self.publication_base = self.cfg.get("publication-base", "publication/") self.publication_multimodule = self.cfg.getboolean("publication-multimodule", False) rpki.http.server( - host = self.http_server_host, - port = self.http_server_port, - handlers = (("/control", self.control_handler), - ("/client/", self.client_handler))) + host = self.http_server_host, + port = self.http_server_port, + handlers = (("/control", self.control_handler), + ("/client/", self.client_handler))) def handler_common(self, query, client, cb, certs, crl = None): """ diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index a686235d..6ad5bb39 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -365,7 +365,7 @@ class main(object): self.child_bpki_cert = rpki.x509.X509(Auto_update = self.cfg.get("child-bpki-cert")) self.http_server_host = self.cfg.get("server-host", "") - self.http_server_port = int(self.cfg.get("server-port")) + self.http_server_port = self.cfg.getint("server-port") self.rpki_class_name = self.cfg.get("rpki-class-name", "wombat") diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py index 9594f668..2a0b7c4b 100644 --- a/rpkid/rpki/rpkid.py +++ b/rpkid/rpki/rpkid.py @@ -134,7 +134,7 @@ class main(object): self.irdb_url = self.cfg.get("irdb-url") self.http_server_host = self.cfg.get("server-host", "") - self.http_server_port = self.cfg.getint("server-port", 4433) + self.http_server_port = self.cfg.getint("server-port") self.publication_kludge_base = self.cfg.get("publication-kludge-base", "publication/") |