diff options
| author | Rob Austein <sra@hactrn.net> | 2009-10-14 18:02:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-10-14 18:02:42 +0000 |
| commit | 64dfe8392a106f9d07ec52d9ba8a1aa24bd9d326 (patch) | |
| tree | 6370f8540631166cfc0c2b5d3cc971726204d369 /rpkid/testbed.py | |
| parent | cc47ad9099222c295a7d07f872f4a6c50c488404 (diff) | |
Clean up use of "pubd" SQL database in test scripts
svn path=/myrpki/yamltest.py; revision=2827
Diffstat (limited to 'rpkid/testbed.py')
| -rw-r--r-- | rpkid/testbed.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/rpkid/testbed.py b/rpkid/testbed.py index 966ce29c..a9e6e3c5 100644 --- a/rpkid/testbed.py +++ b/rpkid/testbed.py @@ -106,6 +106,8 @@ testbed_dir = cfg.get("testbed_dir", testbed_name + ".dir") irdb_db_pass = cfg.get("irdb_db_pass", "fnord") rpki_db_pass = cfg.get("rpki_db_pass", "fnord") pubd_db_pass = cfg.get("pubd_db_pass", "fnord") +pubd_db_name = cfg.get("pubd_db_name", "pubd0") +pubd_db_user = cfg.get("pubd_db_user", "pubd") base_port = int(cfg.get("base_port", "4400")) @@ -1135,16 +1137,18 @@ def setup_publication(pubd_sql): global rsyncd_dir rsyncd_dir = pubd_dir.rstrip("/") + rootd_sia[i:] os.makedirs(rsyncd_dir) - db = MySQLdb.connect(user = "pubd", db = "pubd", passwd = pubd_db_pass) + db = MySQLdb.connect(db = pubd_db_name, user = pubd_db_user, passwd = pubd_db_pass) cur = db.cursor() db.autocommit(True) for sql in pubd_sql: cur.execute(sql) db.close() - d = { "pubd_name" : pubd_name, - "pubd_port" : pubd_port, - "pubd_pass" : pubd_db_pass, - "pubd_dir" : pubd_dir } + d = { "pubd_name" : pubd_name, + "pubd_port" : pubd_port, + "pubd_db_name" : pubd_db_name, + "pubd_db_user" : pubd_db_user, + "pubd_db_pass" : pubd_db_pass, + "pubd_dir" : pubd_dir } f = open(pubd_name + ".conf", "w") f.write(pubd_fmt_1 % d) f.close() @@ -1458,9 +1462,9 @@ comment = RPKI test pubd_fmt_1 = '''\ [pubd] -sql-database = %(pubd_name)s -sql-username = pubd -sql-password = %(pubd_pass)s +sql-database = %(pubd_db_name)s +sql-username = %(pubd_db_user)s +sql-password = %(pubd_db_pass)s bpki-ta = %(pubd_name)s-TA.cer pubd-cert = %(pubd_name)s-PUBD.cer pubd-key = %(pubd_name)s-PUBD.key |