diff options
| author | Rob Austein <sra@hactrn.net> | 2009-07-03 21:48:02 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-07-03 21:48:02 +0000 |
| commit | df0605bfa60b56eed2495880b2be903248d743d9 (patch) | |
| tree | 759e07d6aedbcc534fc506d2aeab9163026c124d | |
| parent | a31481781ded262d01f1dfacc9d4d7b5938eaa5c (diff) | |
Run myrpki.main() automatically from myirbe if [myrpki] section is present.
svn path=/myrpki/myirbe.py; revision=2566
| -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): |