diff options
| -rw-r--r-- | myrpki.rototill/myirbe.py | 24 | ||||
| -rw-r--r-- | myrpki.rototill/myrpki.py | 3 |
2 files changed, 3 insertions, 24 deletions
diff --git a/myrpki.rototill/myirbe.py b/myrpki.rototill/myirbe.py index d6fa330d..2f87ac50 100644 --- a/myrpki.rototill/myirbe.py +++ b/myrpki.rototill/myirbe.py @@ -82,13 +82,9 @@ rpki.log.init("myirbe") cfg_file = "myrpki.conf" -bpki_only = False - -opts, argv = getopt.getopt(sys.argv[1:], "bc:h?", ["bpki_only", "config=", "help"]) +opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"]) for o, a in opts: - if o in ("-b", "--bpki_only"): - bpki_only = True - elif o in ("-c", "--config"): + if o in ("-c", "--config"): cfg_file = a elif o in ("-h", "--help", "-?"): print __doc__ @@ -105,23 +101,7 @@ handle = cfg.get("handle", cfg.get("handle", "Amnesiac", "myrpki")) run_pubd = cfg.getboolean("run_pubd", False) run_rootd = cfg.getboolean("run_rootd", False) -bpki_modified = False - bpki = myrpki.CA(cfg_file, cfg.get("myirbe_bpki_directory")) -bpki_modified |= bpki.setup(cfg.get("bpki_ta_dn", "/CN=%s BPKI TA" % handle)) -bpki_modified |= bpki.ee( cfg.get("bpki_rpkid_ee_dn", "/CN=%s rpkid EE" % handle), "rpkid") -bpki_modified |= bpki.ee( cfg.get("bpki_irdbd_ee_dn", "/CN=%s irdbd EE" % handle), "irdbd") -bpki_modified |= bpki.ee( cfg.get("bpki_irbe_ee_dn", "/CN=%s irbe EE" % handle), "irbe") -if run_pubd: - bpki_modified |= bpki.ee( cfg.get("bpki_pubd_ee_dn", "/CN=%s pubd EE" % handle), "pubd") -if run_rootd: - bpki_modified |= bpki.ee( cfg.get("bpki_rootd_ee_dn", "/CN=%s rootd EE" % handle), "rootd") - -if bpki_modified: - print "BPKI (re)initialized. You need to (re)start daemons before continuing." - -if bpki_modified or bpki_only: - sys.exit() # Default values for CRL parameters are very low, for testing. diff --git a/myrpki.rototill/myrpki.py b/myrpki.rototill/myrpki.py index 33ddda3c..1a55d755 100644 --- a/myrpki.rototill/myrpki.py +++ b/myrpki.rototill/myrpki.py @@ -651,11 +651,10 @@ def main(argv = ()): openssl = cfg.get(section, "openssl") if cfg.has_option(section, "openssl") else "openssl" bpki = CA(cfg_file, bpki_dir) - bpki.setup("/CN=%s TA" % my_handle) e = etree_read(xml_filename) if e: - bsc_req, bsc_cer = bpki.bsc(e.findtext("{%s}%s" % (namespace, "bpki_bsc_pkcs10"))) + bsc_req, bsc_cer = bpki.bsc(e.findtext(tag("bpki_bsc_pkcs10"))) else: bsc_req, bsc_cer = None, None |