diff options
| -rwxr-xr-x | scripts/irdb.py | 3 | ||||
| -rwxr-xr-x | scripts/rpkid.py | 8 | ||||
| -rw-r--r-- | scripts/testdb.py | 8 |
3 files changed, 16 insertions, 3 deletions
diff --git a/scripts/irdb.py b/scripts/irdb.py index a81fcfd5..ec8bb13b 100755 --- a/scripts/irdb.py +++ b/scripts/irdb.py @@ -88,6 +88,9 @@ if argv: cfg = rpki.config.parser(cfg_file) cfg_section = "irdb" +if cfg.has_option(cfg_section, "startup-message"): + rpki.log.info(cfg.get(cfg_section, "startup-message")) + db = MySQLdb.connect(user = cfg.get(cfg_section, "sql-username"), db = cfg.get(cfg_section, "sql-database"), passwd = cfg.get(cfg_section, "sql-password")) diff --git a/scripts/rpkid.py b/scripts/rpkid.py index 0c0f8788..ef8ff2be 100755 --- a/scripts/rpkid.py +++ b/scripts/rpkid.py @@ -104,7 +104,13 @@ for o,a in opts: if argv: raise RuntimeError, "Unexpected arguments %s" % argv -gctx = global_context(cfg = rpki.config.parser(cfg_file), section = "rpkid") +cfg = rpki.config.parser(cfg_file) +cfg_section = "rpkid" + +if cfg.has_option(cfg_section, "startup-message"): + rpki.log.info(cfg.get(cfg_section, "startup-message")) + +gctx = global_context(cfg = cfg, section = cfg_section) rpki.https.server(privateKey = gctx.https_key, certChain = gctx.https_certs, diff --git a/scripts/testdb.py b/scripts/testdb.py index 6a54ac7e..7e2fb1dc 100644 --- a/scripts/testdb.py +++ b/scripts/testdb.py @@ -409,7 +409,7 @@ class allocation(object): pass def setup_biz_cert_chain(name): - s = "" + s = "exec >/dev/null 2>&1\n" for kind in ("EE", "CA", "TA"): d = { "name" : name, "kind" : kind, @@ -432,7 +432,7 @@ def setup_rootd(rpkid_name): f = open(rootd_name + ".conf", "w") f.write(rootd_fmt_1 % d) f.close() - s = "" + s = "exec >/dev/null 2>&1\n" if not os.path.exists(rootd_name + ".key") or not os.path.exists(rootd_name + ".req"): s += rootd_fmt_2 % d s += rootd_fmt_3 % d @@ -488,6 +488,8 @@ conf_fmt_1 = '''\ [rpkid] +startup-message = This is %(my_name)s rpkid + sql-database = %(rpki_db_name)s sql-username = rpki sql-password = %(rpki_db_pass)s @@ -512,6 +514,8 @@ server-port = %(rpki_port)d [irdb] +startup-message = This is %(my_name)s irdbd + sql-database = %(irdb_db_name)s sql-username = irdb sql-password = %(irdb_db_pass)s |