Merge changes I47ec8fcb,I2cd200f3

[gigi.git] / doc / scripts / gigi

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index 0a4ee3d81d0f9baf70e8adac0728da2eeb4db99c..e0e6dc03a18c9db70ff53ba068d0787ee41d2988 100755 (executable)
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -1,14 +1,15 @@
 #!/bin/sh
 
-: ${GIGI_CONF_DIR:=/etc/cacert/gigi}
+: ${GIGI_CONF_DIR:=/etc/wpia/gigi}
 
 [ -r "$GIGI_CONF_DIR/launcher.conf" ] && . "$GIGI_CONF_DIR/launcher.conf"
 
 # assign default values
 : \
     ${JDBC_DRIVER:=/usr/share/java/postgresql-jdbc4.jar} \
+    ${DNSJAVA:=/usr/share/java/dnsjava.jar} \
     ${GIGI_EXEC:=/usr/share/java/gigi.jar} \
-    ${GIGI_DATA_DIR:=/var/lib/cacert-gigi}
+    ${GIGI_DATA_DIR:=/var/lib/wpia-gigi}
 
 die() {
     if [ $# -ge 1 ]; then
@@ -26,7 +27,7 @@ runGigiClass() {
         java_opts="$1"
         shift
     fi
-    exec java $java_opts -cp "$JDBC_DRIVER:$GIGI_EXEC" org.cacert.gigi.$class "$@"
+    exec java $java_opts -cp "$JDBC_DRIVER:$DNSJAVA:$GIGI_EXEC" club.wpia.gigi.$class "$@"
 }
 
 command="$1"
@@ -35,10 +36,10 @@ case "$command" in
     start) runGigiClass Launcher ;;
     debug) runGigiClass Launcher "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000" ;;
     start-daemon)
-        exec 3</etc/cacert/gigi/conf.tar || die 'open config'
-        exec 4>>/var/log/cacert-gigi.log || die 'open log'
+        exec 3</etc/gigi/conf.tar || die 'open config'
+        exec 4>>/var/log/wpia-gigi.log || die 'open log'
         runGigiClass Launcher <&3 >&4 2>&1 &
-        echo $! > /var/run/cacert-gigi.pid
+        echo $! > /var/run/wpia-gigi.pid
         ;;
     signer) runGigiClass util.SimpleSigner ;;
     reset-database) runGigiClass util.DatabaseManager ;;
@@ -56,7 +57,7 @@ Usage: gigi COMMAND [ARGUMENT...]
 Commands:
     start - start gigi
     debug - start gigi in debug mode (on port 8000, with config from stdin)
-    start-daemon - start gigi in background (using config from /etc/cacert/gig/config.tar)
+    start-daemon - start gigi in background (using config from /etc/gig/config.tar)
     signer - start the simple signer
     signer-conf - extract config for simple signer (and reset-database) from the tar from stdin
     reset-database - reset the database