diff options
| author | Rob Austein <sra@hactrn.net> | 2008-07-11 06:05:37 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-07-11 06:05:37 +0000 |
| commit | 28563bb7ed3fe15d6790f33135a420016fe96c5f (patch) | |
| tree | fcc6e8772ccb6b4d96f0178a8fe3504c1c11c3b0 | |
| parent | dd36c5c93fb53adb4f06f26fb82fc16f398262df (diff) | |
Publication cleanup
svn path=/rpkid/rpki/left_right.py; revision=1987
| -rw-r--r-- | rpkid/rpki/left_right.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/rpkid/rpki/left_right.py b/rpkid/rpki/left_right.py index 3f594af5..2b42ad85 100644 --- a/rpkid/rpki/left_right.py +++ b/rpkid/rpki/left_right.py @@ -543,6 +543,10 @@ class route_origin_elt(data_elt): cert = None roa = None + ## @var publish_ee_separately + # Whether to publish the ROA EE certificate separately from the ROA. + publish_ee_separately = False + def sql_fetch_hook(self): """Extra SQL fetch actions for route_origin_elt -- handle prefix list.""" self.ipv4 = rpki.resource_set.roa_prefix_set_ipv4.from_sql( @@ -685,7 +689,8 @@ class route_origin_elt(data_elt): repository = parent.repository() repository.publish(self.roa, self.roa_uri(ca)) - repository.publish(self.cert, self.ee_uri(ca)) + if self.publish_ee_separately: + repository.publish(self.cert, self.ee_uri(ca)) ca_detail.generate_manifest() def withdraw_roa(self, regenerate = False): @@ -712,7 +717,8 @@ class route_origin_elt(data_elt): rpki.log.debug("Withdrawing ROA and revoking its EE cert") rpki.rpki_engine.revoked_cert_obj.revoke(cert = cert, ca_detail = ca_detail) repository.withdraw(roa, roa_uri) - repository.withdraw(cert, ee_uri) + if self.publish_ee_separately: + repository.withdraw(cert, ee_uri) self.gctx.sql.sweep() ca_detail.generate_crl() ca_detail.generate_manifest() |