diff options
| author | Rob Austein <sra@hactrn.net> | 2014-08-07 18:43:59 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-08-07 18:43:59 +0000 |
| commit | ff33e2a335a01f2b438c84f7108cae37eb444e45 (patch) | |
| tree | dadf393853f002bdb2ec4fa74060cea96effd7dd /rpki/pubd.py | |
| parent | 8032686109d62e4dbd8bb2955fbaa7b2bbdcebbb (diff) | |
Rework RRDP filename scheme to simplify Apache configuration.
svn path=/branches/tk705/; revision=5915
Diffstat (limited to 'rpki/pubd.py')
| -rw-r--r-- | rpki/pubd.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpki/pubd.py b/rpki/pubd.py index 8b58747e..4f1ea417 100644 --- a/rpki/pubd.py +++ b/rpki/pubd.py @@ -347,7 +347,7 @@ class session_obj(rpki.sql.sql_persistent): Write current session snapshot to disk. """ - self.write_rrdp_file("%s/snapshot/%s.xml" % (self.uuid, self.serial), self.snapshot) + self.write_rrdp_file("snapshot/%s/%s.xml" % (self.uuid, self.serial), self.snapshot) def write_deltas(self): """ @@ -367,7 +367,7 @@ class session_obj(rpki.sql.sql_persistent): session_id = self.uuid, serial = str(self.serial)) SubElement(xml, rrdp_xmlns + "snapshot", - uri = "%s/%s/snapshot/%d.xml" % (self.gctx.rrdp_uri_base, self.uuid, self.serial), + uri = "%s/snapshot/%s/%d.xml" % (self.gctx.rrdp_uri_base, self.uuid, self.serial), hash = self.hash) for delta in self.deltas: se = SubElement(xml, rrdp_xmlns + "delta", @@ -376,7 +376,7 @@ class session_obj(rpki.sql.sql_persistent): hash = delta.hash) se.set("from", str(delta.serial - 1)) rpki.relaxng.rrdp.assertValid(xml) - self.write_rrdp_file("%s/notification.xml" % self.uuid, + self.write_rrdp_file("notification/%s.xml" % self.uuid, ElementToString(xml, pretty_print = True), overwrite = True) @@ -402,7 +402,7 @@ class delta_obj(rpki.sql.sql_persistent): @property def fn(self): - return "%s/deltas/%s-%s.xml" % (self.session.uuid, self.serial - 1, self.serial) + return "deltas/%s/%s-%s.xml" % (self.session.uuid, self.serial - 1, self.serial) @classmethod def create(cls, session): |