From 4c537cad182aa3f4f5aea9322759cea88e2210bc Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 20 Feb 2014 21:32:11 +0000 Subject: All this router certificate stuff requires enough SQL changes that we're going to need a fancy upgrade script when we merge this to trunk no matter what else we do, so might as well flip the default on the long-awaited `merge_publication_directories` in the router certificate development branch and handle the upgrade actions for that along with everything else when we finally merge back to trunk. See #479. svn path=/branches/tk671/; revision=5678 --- rpkid/rpki/rpkid.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'rpkid') diff --git a/rpkid/rpki/rpkid.py b/rpkid/rpki/rpkid.py index b84e0b39..69d7a242 100644 --- a/rpkid/rpki/rpkid.py +++ b/rpkid/rpki/rpkid.py @@ -117,9 +117,14 @@ class main(object): # Icky hack to let Iain do some testing quickly, should go away # once we sort out whether we can make this change permanent. + # + # OK, the stuff to add router certificate support makes enough + # other changes that we're going to need a migration program in + # any case, so might as well throw the switch here too, or at + # least find out if it (still) works as expected. self.merge_publication_directories = self.cfg.getboolean("merge_publication_directories", - False) + True) self.use_internal_cron = self.cfg.getboolean("use-internal-cron", True) -- cgit v1.2.3