diff options
author | Rob Austein <sra@hactrn.net> | 2007-12-24 09:31:48 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2007-12-24 09:31:48 +0000 |
commit | 4d7072bd10f807558dfd60c2a3e65fe6584bcdb3 (patch) | |
tree | 291536b8a8e9c26ff5ac46d988b5587f2d9fc75d /scripts/irbe-setup.py | |
parent | 9bd1ce773943b587f83c91c77de7e379df421c63 (diff) |
Teach config parser about default sections.
svn path=/scripts/Makefile; revision=1439
Diffstat (limited to 'scripts/irbe-setup.py')
-rw-r--r-- | scripts/irbe-setup.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/irbe-setup.py b/scripts/irbe-setup.py index 36d17635..aa96607f 100644 --- a/scripts/irbe-setup.py +++ b/scripts/irbe-setup.py @@ -13,18 +13,18 @@ rpki.log.init("irbe-setup") cfg = rpki.config.parser("irbe.conf") -db = MySQLdb.connect(user = cfg.get("irdb", "sql-username"), - db = cfg.get("irdb", "sql-database"), - passwd = cfg.get("irdb", "sql-password")) +db = MySQLdb.connect(user = cfg.get("sql-username", section = "irdb"), + db = cfg.get("sql-database", section = "irdb"), + passwd = cfg.get("sql-password", section = "irdb")) cur = db.cursor() -cms_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("irbe-cli", "cms-cert")) -cms_key = rpki.x509.RSA( Auto_file = cfg.get( "irbe-cli", "cms-key")) -cms_ta = rpki.x509.X509( Auto_file = cfg.get( "irbe-cli", "cms-ta")) -https_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("irbe-cli", "https-cert")) -https_key = rpki.x509.RSA( Auto_file = cfg.get( "irbe-cli", "https-key")) -https_tas = rpki.x509.X509_chain(Auto_files = cfg.multiget("irbe-cli", "https-ta")) -https_url = cfg.get( "irbe-cli", "https-url") +cms_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("cms-cert", section = "irbe-cli")) +cms_key = rpki.x509.RSA( Auto_file = cfg.get( "cms-key", section = "irbe-cli")) +cms_ta = rpki.x509.X509( Auto_file = cfg.get( "cms-ta", section = "irbe-cli")) +https_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-cert", section = "irbe-cli")) +https_key = rpki.x509.RSA( Auto_file = cfg.get( "https-key", section = "irbe-cli")) +https_tas = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-ta", section = "irbe-cli")) +https_url = cfg.get( "https-url", section = "irbe-cli") def call_rpkid(pdu): """Hand a PDU to rpkid and get back the response. Just throw an |