aboutsummaryrefslogtreecommitdiff
path: root/myrpki
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2009-10-13 22:31:03 +0000
committerRob Austein <sra@hactrn.net>2009-10-13 22:31:03 +0000
commit1b72e3dc18a50ef6891afa71cb5eb3438e76fbbb (patch)
tree3f49cd1d0ebde6c2cf0d81ac2675a0fd26bd2ff7 /myrpki
parentd57b2d6e46ac0b1400e3a38c408b2d3bdeb1b306 (diff)
Rewrite start-servers as a Python script
svn path=/myrpki/README; revision=2822
Diffstat (limited to 'myrpki')
-rw-r--r--myrpki/README6
-rw-r--r--myrpki/start-servers.py70
-rw-r--r--myrpki/start-servers.sh33
3 files changed, 71 insertions, 38 deletions
diff --git a/myrpki/README b/myrpki/README
index 11057577..b8547822 100644
--- a/myrpki/README
+++ b/myrpki/README
@@ -289,7 +289,7 @@ The [current] steps are:
rsyncd for other purposes. See the rsync(1) and rsyncd.conf(5)
manual pages for more details.
-8) Start the daemons. You can use $top/myrpki/start-servers.sh to do
+8) Start the daemons. You can use $top/myrpki/start-servers.py to do
this, or write your own script.
If you intend to run pubd, you should make sure that the directory
@@ -297,10 +297,6 @@ The [current] steps are:
is writable by the userid that will be running pubd, and should
also make sure to start rsyncd.
- [start-servers.sh should be replaced by a python script that
- understands myprki.conf so that it can figure out whether to run
- pubd and rootd from the config file.]
-
9) Run myirbe.py again, twice, this time with no arguments.
$ python $top/myrpki/myirbe.py
diff --git a/myrpki/start-servers.py b/myrpki/start-servers.py
new file mode 100644
index 00000000..5834918a
--- /dev/null
+++ b/myrpki/start-servers.py
@@ -0,0 +1,70 @@
+"""
+Start servers, logging to files, looking at config file to figure out
+which servers the user wants started.
+
+$Id$
+
+Copyright (C) 2009 Internet Systems Consortium ("ISC")
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Portions copyright (C) 2007--2008 American Registry for Internet Numbers ("ARIN")
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND ARIN DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL ARIN BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+"""
+
+import subprocess, os, getopt, sys, time, rpki.config
+
+rpkid_dir = os.path.normpath(os.path.join(sys.path[0], "../rpkid"))
+
+os.environ["TZ"] = "UTC"
+time.tzset()
+
+cfg_file = "myrpki.conf"
+
+opts, argv = getopt.getopt(sys.argv[1:], "c:h?", ["config=", "help"])
+for o, a in opts:
+ if o in ("-h", "--help", "-?"):
+ print __doc__
+ sys.exit(0)
+ if o in ("-c", "--config"):
+ cfg_file = a
+
+names = ["irdbd", "rpkid"]
+
+cfg = rpki.config.parser(cfg_file, "myirbe")
+
+if cfg.getboolean("want_pubd", False):
+ names.append("pubd")
+
+if cfg.getboolean("want_rootd", False):
+ names.append("rootd")
+
+for name in names:
+ proc = subprocess.Popen(("python", os.path.join(rpkid_dir, name + ".py"), "-c", cfg_file),
+ stdout = open(name + ".log", "a"), stderr = subprocess.STDOUT)
+ if proc.poll() is None:
+ print "Started", name
+ else:
+ print "Problem starting", name
diff --git a/myrpki/start-servers.sh b/myrpki/start-servers.sh
deleted file mode 100644
index c9460d42..00000000
--- a/myrpki/start-servers.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -
-# $Id$
-#
-# Copyright (C) 2009 Internet Systems Consortium ("ISC")
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-: ${rpkid_dir=../rpkid}
-: ${want_pubd=no}
-: ${want_rootd=no}
-
-python ${rpkid_dir}/irdbd.py -c myrpki.conf >> irdbd.log 2>&1 &
-python ${rpkid_dir}/rpkid.py -c myrpki.conf >> rpkid.log 2>&1 &
-
-if test "$want_pubd" = "yes"
-then
- python ${rpkid_dir}/pubd.py -c myrpki.conf >> pubd.log 2>&1 &
-fi
-
-if test "$want_rootd" = "yes"
-then
- python ${rpkid_dir}/rootd.py -c myrpki.conf >> rootd.log 2>&1 &
-fi