Update shell scripts

svn path=/myrpki/run-daemons.sh; revision=2759

3 files changed, 49 insertions, 32 deletions

diff --git a/myrpki/run-daemons.sh b/myrpki/run-daemons.sh
deleted file mode 100755
index c24af775..00000000
--- a/myrpki/run-daemons.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh -
-# $Id$
-
-set -x
-
-cd `dirname $0`
-
-if test -z "$STY"
-then
-
-  exec screen -L sh $0 ${1+"$@"}
-
-else
-
-  #screen python ../rpkid/irdbd.py
-  #screen python ../rpkid/rpkid.py
-  #screen python ../rpkid/pubd.py
-
-  python ../rpkid/irdbd.py &
-  python ../rpkid/rpkid.py &
-  python ../rpkid/pubd.py &
-  
-  #if test -n "$*"; then sleep 5; "$@"; fi
-
-  # Apparently Control-C-ing out of this kills the daemons, which is
-  # what we want but was a surprise to me.  Probably SIGHUP effect due
-  # to running under screen, or something like that.
-  wait
-
-fi
diff --git a/myrpki/start-servers.sh b/myrpki/start-servers.sh
new file mode 100644
index 00000000..a17d2a1c
--- /dev/null
+++ b/myrpki/start-servers.sh
@@ -0,0 +1,33 @@
+#!/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/irdbd.py -c myrpki.conf >> irdbd.log 2>&1 &
+python ../rpkid/rpkid.py -c myrpki.conf >> rpkid.log 2>&1 &
+
+if test "$want_pubd" = "yes"
+then
+    python ../rpkid/pubd.py  -c myrpki.conf >> pubd.log  2>&1 &
+fi
+
+if test "$want_rootd" = "yes"
+then
+    python ../rpkid/rootd.py -c myrpki.conf >> rootd.log 2>&1 &
+fi
diff --git a/myrpki/verify-bpki.sh b/myrpki/verify-bpki.sh
index 432aa9c4..06b238db 100755
--- a/myrpki/verify-bpki.sh
+++ b/myrpki/verify-bpki.sh
@@ -1,8 +1,22 @@
 #!/bin/sh -
 # $Id$
 #
-# Tests of generated BPKI certificates.  This is kind of cheesy but
-# does test some of the basic stuff.
+# 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.
+
+# Tests of generated BPKI certificates.  Kind of cheesy, but does test
+# the basic stuff.
 
 # Check that CRLs verify properly
 find bpki.* -name '*.crl' | sed 's=^\(.*\)/\(.*\)$=echo -n "&: "; openssl crl -CAfile \1/ca.cer -noout -in &=' | sh