Clean up various old messes in how we configure listener server and

port in daemons.

svn path=/trunk/; revision=5251

1 files changed, 5 insertions, 5 deletions

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):
     """