Helps if we preserve information the server kindly sent to us.

svn path=/myrpki.rototill/myrpki.py; revision=3064

1 files changed, 13 insertions, 2 deletions

diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py
index 85edd75e..37f01c8d 100644
--- a/myrpki.rototill/myrpki.py
+++ b/myrpki.rototill/myrpki.py
@@ -1136,16 +1136,24 @@ class main(rpki.cli.Cmd):
     asn_csv_file                  = self.cfg.get("asn_csv")
 
     # This probably should become an argument instead of (or in
-    # addition to a default from?) config file.
+    # addition to a default from?) a config file option.
     xml_filename                  = self.cfg.get("xml_filename")
 
     try:
-      bsc_req, bsc_cer = self.bpki_resources.bsc(etree_read(xml_filename).findtext("bpki_bsc_pkcs10"))
+      e = etree_read(xml_filename)
+      bsc_req, bsc_cer = self.bpki_resources.bsc(e.findtext("bpki_bsc_pkcs10"))
+      service_uri = e.get("service_uri")
+      server_ta = e.findtext("bpki_server_ta")
     except IOError:
       bsc_req, bsc_cer = None, None
+      service_uri = None
+      server_ta = None
 
     e = Element("myrpki", handle = self.handle)
 
+    if service_uri:
+      e.set("service_uri", service_uri)
+
     roa_requests.from_csv(roa_csv_file).xml(e)
 
     children.from_csv(
@@ -1166,6 +1174,9 @@ class main(rpki.cli.Cmd):
     if bsc_req:
       PEMElement(e, "bpki_bsc_pkcs10", bsc_req)
 
+    if server_ta:
+      SubElement(e, "bpki_server_ta").text = server_ta
+
     etree_write(e, xml_filename)