diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/apnic-poke-1.sh | 6 | ||||
| -rw-r--r-- | scripts/apnic-poke-2.sh | 6 | ||||
| -rw-r--r-- | scripts/irbe-setup.py | 22 | ||||
| -rwxr-xr-x | scripts/irdbd.py (renamed from scripts/irdb.py) | 10 | ||||
| -rw-r--r-- | scripts/rootd.sh | 4 | ||||
| -rw-r--r-- | scripts/testbed.py | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/scripts/apnic-poke-1.sh b/scripts/apnic-poke-1.sh index 63685c0d..1f66e7c4 100644 --- a/scripts/apnic-poke-1.sh +++ b/scripts/apnic-poke-1.sh @@ -83,11 +83,11 @@ python irbe-cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-cer if test -n "$STY" then screen python rootd.py - screen python irdb.py + screen python irdbd.py else python rootd.py >>rootd.log 2>&1 & rootd=$! - python irdb.py >>irdb.log 2>&1 & irdb=$! - trap "kill $rpkid $irdb $rootd" 0 1 2 3 13 15 + python irdbd.py >>irdbd.log 2>&1 & irdbd=$! + trap "kill $rpkid $irdbd $rootd" 0 1 2 3 13 15 fi python cronjob.py diff --git a/scripts/apnic-poke-2.sh b/scripts/apnic-poke-2.sh index 53f842a0..62eb1f6e 100644 --- a/scripts/apnic-poke-2.sh +++ b/scripts/apnic-poke-2.sh @@ -95,10 +95,10 @@ python irbe-cli.py child --self_id 1 --action create --bsc_id 1 --cms_ta biz-cer if test -n "$STY" then - screen python irdb.py + screen python irdbd.py else - python irdb.py >>irdb.log 2>&1 & irdb=$! - trap "kill $rpkid $irdb" 0 1 2 3 13 15 + python irdbd.py >>irdbd.log 2>&1 & irdbd=$! + trap "kill $rpkid $irdbd" 0 1 2 3 13 15 fi python cronjob.py diff --git a/scripts/irbe-setup.py b/scripts/irbe-setup.py index aa96607f..d95032e6 100644 --- a/scripts/irbe-setup.py +++ b/scripts/irbe-setup.py @@ -11,20 +11,20 @@ import rpki.x509, rpki.config, rpki.log rpki.log.init("irbe-setup") -cfg = rpki.config.parser("irbe.conf") +cfg = rpki.config.parser("irbe.conf", "irbe-cli") -db = MySQLdb.connect(user = cfg.get("sql-username", section = "irdb"), - db = cfg.get("sql-database", section = "irdb"), - passwd = cfg.get("sql-password", section = "irdb")) +db = MySQLdb.connect(user = cfg.get("sql-username", section = "irdbd"), + db = cfg.get("sql-database", section = "irdbd"), + passwd = cfg.get("sql-password", section = "irdbd")) cur = db.cursor() -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") +cms_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("cms-cert")) +cms_key = rpki.x509.RSA( Auto_file = cfg.get( "cms-key")) +cms_ta = rpki.x509.X509( Auto_file = cfg.get( "cms-ta")) +https_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-cert")) +https_key = rpki.x509.RSA( Auto_file = cfg.get( "https-key")) +https_tas = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-ta")) +https_url = cfg.get( "https-url") def call_rpkid(pdu): """Hand a PDU to rpkid and get back the response. Just throw an diff --git a/scripts/irdb.py b/scripts/irdbd.py index 75cb9df8..1d79e875 100755 --- a/scripts/irdb.py +++ b/scripts/irdbd.py @@ -3,9 +3,9 @@ """ IR database daemon. -Usage: python rpkid.py [ { -c | --config } configfile ] [ { -h | --help } ] +Usage: python irdbd.py [ { -c | --config } configfile ] [ { -h | --help } ] -Default configuration file is irbe.conf, override with --config option. +Default configuration file is irdbd.conf, override with --config option. """ import sys, os, time, getopt, urlparse, traceback @@ -71,9 +71,9 @@ def handler(query, path): os.environ["TZ"] = "UTC" time.tzset() -rpki.log.init("irdb") +rpki.log.init("irdbd") -cfg_file = "irbe.conf" +cfg_file = "irdbd.conf" opts,argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"]) for o,a in opts: @@ -85,7 +85,7 @@ for o,a in opts: if argv: raise RuntimeError, "Unexpected arguments %s" % argv -cfg = rpki.config.parser(cfg_file, "irdb") +cfg = rpki.config.parser(cfg_file, "irdbd") startup_msg = cfg.get("startup-message", "") if startup_msg: diff --git a/scripts/rootd.sh b/scripts/rootd.sh index 860ad0bd..88586b51 100644 --- a/scripts/rootd.sh +++ b/scripts/rootd.sh @@ -78,8 +78,8 @@ then rm -rf publication python rootd.py & rootd=$! - python irdb.py & irdb=$! - trap "kill $rpkid $irdb $rootd" 0 1 2 3 13 15 + python irdbd.py & irdbd=$! + trap "kill $rpkid $irdbd $rootd" 0 1 2 3 13 15 : Waiting to let daemons start up; sleep 5 diff --git a/scripts/testbed.py b/scripts/testbed.py index 71fe3c67..fc2b6c8b 100644 --- a/scripts/testbed.py +++ b/scripts/testbed.py @@ -73,7 +73,7 @@ rootd_sia = cfg.get("rootd_sia", "rsync://wombat.invalid/") prog_python = cfg.get("prog_python", "python") prog_rpkid = cfg.get("prog_rpkid", "../rpkid.py") -prog_irdbd = cfg.get("prog_irdbd", "../irdb.py") +prog_irdbd = cfg.get("prog_irdbd", "../irdbd.py") prog_poke = cfg.get("prog_poke", "../testpoke.py") prog_rootd = cfg.get("prog_rootd", "../rootd.py") prog_openssl = cfg.get("prog_openssl", "../../openssl/openssl/apps/openssl") @@ -685,7 +685,7 @@ irdb-url = https://localhost:%(irdb_port)d/ server-host = localhost server-port = %(rpki_port)d -[irdb] +[irdbd] startup-message = This is %(my_name)s irdbd |