diff options
| -rw-r--r-- | myrpki.rototill/myrpki.py | 6 | ||||
| -rw-r--r-- | myrpki.rototill/myrpki.rnc | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py index f3ff2c5c..eec0fd74 100644 --- a/myrpki.rototill/myrpki.py +++ b/myrpki.rototill/myrpki.py @@ -933,13 +933,11 @@ class main(rpki.cli.Cmd): if not os.path.exists(rootd_child_fn): os.link(self.bpki_servers.xcert(self.bpki_resources.cer), rootd_child_fn) - # If we're running pubd, construct repository request for it, as - # if we had received an offer. + # If we're running pubd, offer ourself publication. if self.run_pubd: - e = Element("repository", type = "request", handle = self.handle, parent_handle = self.handle) + e = Element("repository", type = "offer", handle = self.handle, parent_handle = self.handle) PEMElement(e, "bpki_client_ta", self.bpki_resources.cer) - SubElement(e, "contact_info").text = self.pubd_contact_info etree_write(e, self.entitydb("repositories", "%s.xml" % self.handle)) diff --git a/myrpki.rototill/myrpki.rnc b/myrpki.rototill/myrpki.rnc index e144d1a1..5f3c5077 100644 --- a/myrpki.rototill/myrpki.rnc +++ b/myrpki.rototill/myrpki.rnc @@ -102,16 +102,6 @@ start |= element repository { start |= element repository { attribute version { version }, - attribute type { "request" }, - attribute handle { object_handle }, - attribute parent_handle { object_handle }, - element bpki_client_ta { base64 }, - authorization?, - contact_info? -} - -start |= element repository { - attribute version { version }, attribute type { "offer" }, attribute handle { object_handle }, attribute parent_handle { object_handle }, |