diff options
| author | Rob Austein <sra@hactrn.net> | 2009-10-01 04:34:06 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-10-01 04:34:06 +0000 |
| commit | 73fad9b9c352d6c4c2aec7c0e2a8afbd57f56cd5 (patch) | |
| tree | 92c7877a1821778c26f98d77d0ce10c0c9d15ea4 /myrpki/yamltest.py | |
| parent | 5054faad366e7d1f1544af4c2b45357acdd4afea (diff) | |
Add a lot of comments to myrpki/examples/myrpki.conf, and reorder
sections to make it a bit easier to find the useful parts.
svn path=/myrpki/arin-rootcert.py; revision=2803
Diffstat (limited to 'myrpki/yamltest.py')
| -rw-r--r-- | myrpki/yamltest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/myrpki/yamltest.py b/myrpki/yamltest.py index f80420ac..8ed99781 100644 --- a/myrpki/yamltest.py +++ b/myrpki/yamltest.py @@ -402,7 +402,9 @@ class allocation(object): r["rootd", "rpki-root-cert"] = "publication/root.cer" r["rootd", "rpki-root-cert-uri"] = "rsync://%s/root.cer" % root_path r["rootd", "rpki-subject-cert"] = "%s.cer" % self.name - r["rpki_x509_extensions", "subjectInfoAccess"] = "1.3.6.1.5.5.7.48.5;URI:rsync://%s/,1.3.6.1.5.5.7.48.10;URI:rsync://%s/root.mnf" % (root_path, root_path) + r["rootd", "rpki-root-manifest"] = "root.mnf" + r["rootd", "root_cert_sia"] = r["rootd", "rpki-base-uri"] + r["rootd", "root_cert_manifest"] = r["rootd", "rpki-base-uri"] + r["rootd", "rpki-root-manifest"] if self.runs_pubd(): r["pubd", "server-port"] = "%d" % self.pubd_port @@ -434,7 +436,7 @@ class allocation(object): print "Writing", f.name section = None - for line in open("myrpki.conf"): + for line in open("examples/myrpki.conf"): m = section_regexp.match(line) if m: section = m.group(1) @@ -633,7 +635,7 @@ rootd_openssl("x509", "-req", "-sha256", "-outform", "DER", "-in", "bpki.myirbe/ca.req", "-out", "publication/root.cer", "-extfile", "myrpki.conf", - "-extensions", "rpki_x509_extensions") + "-extensions", "rootd_x509_extensions") # At this point we need to start a whole lotta daemons. |