aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-04-28 18:03:28 +0000
committerRob Austein <sra@hactrn.net>2016-04-28 18:03:28 +0000
commit002c58cac7309379912c440c0df068c92d70b477 (patch)
tree36157fcf46cd8acb732cf738a8de0ebfb3150485
parent26559b823b01d174f01e2986740e18cd76d2e8d9 (diff)
And of course rootd does everything just a little differently, so we
need a few rootd-specific hacks in the pickling script to make sure we pick up all the certificate files rootd has issued. svn path=/trunk/; revision=6399
-rwxr-xr-xpotpourri/ca-pickle.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/potpourri/ca-pickle.py b/potpourri/ca-pickle.py
index 2c63e978..5b88f3f9 100755
--- a/potpourri/ca-pickle.py
+++ b/potpourri/ca-pickle.py
@@ -65,6 +65,13 @@ for section in cfg.cfg.sections():
if os.path.isfile( cooked_config[section][option]):
filenames.append(cooked_config[section][option])
+# Sigh, even here we need special hacks for rootd, which handles filenames a bit differently.
+rootd_dir = cfg.get(section = "rootd", option = "rpki-root-dir", default = "")
+for option in ("rpki-root-crl", "rpki-root-manifest", "rpki-subject-cert"):
+ fn = os.path.join(rootd_dir, cfg.get(section = "rootd", option = option, default = ""))
+ if os.path.isfile(fn):
+ filenames.append(fn)
+
for i, fn in enumerate(filenames):
filenames[i] = os.path.abspath(fn)