diff options
| -rw-r--r-- | myrpki/myirbe.py | 3 | ||||
| -rw-r--r-- | myrpki/myrpki.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/myrpki/myirbe.py b/myrpki/myirbe.py index 087c5f47..ec0c4467 100644 --- a/myrpki/myirbe.py +++ b/myrpki/myirbe.py @@ -47,6 +47,9 @@ if argv: cfg = rpki.config.parser(cfg_file, "myirbe") +if cfg.has_section("myrpki"): + myrpki.main() + # This probably ought to come from the command line tree = lxml.etree.parse("myrpki.xml").getroot() rng.assertValid(tree) diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py index dbe445fd..10eb3159 100644 --- a/myrpki/myrpki.py +++ b/myrpki/myrpki.py @@ -215,7 +215,7 @@ class CA(object): "RANDFILE" : ".OpenSSL.whines.unless.I.set.this" } def run_ca(self, *args): - cmd = ("openssl", "ca", "-notext", "-verbose", "-batch", "-config", self.cfg) + args + cmd = ("openssl", "ca", "-notext", "-batch", "-config", self.cfg) + args subprocess.check_call(cmd, env = self.env) def run_req(self, key_file, req_file): |