Checkpoint

svn path=/rpkid/pubd.py; revision=1827

2 files changed, 12 insertions, 8 deletions

diff --git a/rpkid/pubd.py b/rpkid/pubd.py
index 49b5a33c..3f35b087 100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd.py
@@ -111,10 +111,11 @@ cfg = rpki.config.parser(cfg_file, "pubd")
 
 pctx = pubd_context(cfg)
 
-rpki.https.server(host              = pctx.https_server_host,
-                  port              = pctx.https_server_port,
-                  server_key        = pctx.pubd_key,
-                  server_cert       = pctx.pubd_cert,
-                  dynamic_x509store = pctx.build_x509store,
-                  handlers          = (("/control", pctx.control_handler),
-                                       ("/client/", pctx.client_handler)))
+rpki.https.server(
+  dynamic_https_trust_anchor    = pctx.build_https_ta_cache,
+  host                          = pctx.https_server_host,
+  port                          = pctx.https_server_port,
+  server_key                    = pctx.pubd_key,
+  server_cert                   = pctx.pubd_cert,
+  handlers                      = (("/control", pctx.control_handler),
+                                   ("/client/", pctx.client_handler)))
diff --git a/rpkid/testbed.py b/rpkid/testbed.py
index 961846e1..24f8615a 100644
--- a/rpkid/testbed.py
+++ b/rpkid/testbed.py
@@ -170,6 +170,9 @@ def main():
     rpki.log.info("Starting rootd")
     rootd_process = subprocess.Popen((prog_python, prog_rootd, "-c", rootd_name + ".conf"))
 
+    rpki.log.info("Starting pubd")
+    pubd_process = subprocess.Popen((prog_python, prog_pubd, "-c", pubd_name + ".conf"))
+
     rpki.log.info("Starting rsyncd")
     rsyncd_process = subprocess.Popen((prog_rsyncd, "--daemon", "--no-detach", "--config", rsyncd_name + ".conf"))
 
@@ -222,7 +225,7 @@ def main():
       rpki.log.info("Shutting down")
       for a in db.engines:
         a.kill_daemons()
-      for p,n in ((rootd_process, "rootd"), (rsyncd_process, "rsyncd")):
+      for p,n in ((rootd_process, "rootd"), (pubd_process, "pubd"), (rsyncd_process, "rsyncd")):
         if p is not None:
           rpki.log.info("Killing %s" % n)
           os.kill(p.pid, signal.SIGTERM)