diff options
| author | Rob Austein <sra@hactrn.net> | 2012-10-09 22:12:15 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-10-09 22:12:15 +0000 |
| commit | b22f2d2a13dc31fdde98c274c324f8debf36434d (patch) | |
| tree | e3a5be91fc6bf83b185aad27ab92415054a4b86b /rpkid/tests/yamlconf.py | |
| parent | 131e06531d8b35f08095672a85dc1d67e946266e (diff) | |
Whack SIA and AIA code to use POW instead of POW.pkix. Whack
smoketest repository layout to silence (correct) rcynic whining about
objects not in manifest.
svn path=/branches/tk274/; revision=4761
Diffstat (limited to 'rpkid/tests/yamlconf.py')
| -rw-r--r-- | rpkid/tests/yamlconf.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/rpkid/tests/yamlconf.py b/rpkid/tests/yamlconf.py index 2341ac3f..080b3c57 100644 --- a/rpkid/tests/yamlconf.py +++ b/rpkid/tests/yamlconf.py @@ -395,19 +395,16 @@ class allocation(object): "# Automatically generated, do not edit", "port = %d" % self.rsync_port, "address = %s" % self.hostname, - "[rpki]", "log file = rsyncd.log", "read only = yes", "use chroot = no", + "[rpki]", "path = %s" % self.publication_base_directory, "comment = RPKI test")) if self.is_root: assert self.runs_pubd lines.extend(( "[root]", - "log file = rsyncd_root.log", - "read only = yes", - "use chroot = no", "path = %s" % self.publication_root_directory, "comment = RPKI test root")) if lines: @@ -460,8 +457,7 @@ class allocation(object): root_uri = "rsync://%s/rpki/" % self.rsync_server - root_sia = ((rpki.oids.name2oid["id-ad-caRepository"], ("uri", root_uri)), - (rpki.oids.name2oid["id-ad-rpkiManifest"], ("uri", root_uri + "root.mft"))) + root_sia = (root_uri, root_uri + "root.mft", None) root_cert = rpki.x509.X509.self_certify( keypair = root_key, |