X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=doc%2Fscripts%2Fgigi;h=e0e6dc03a18c9db70ff53ba068d0787ee41d2988;hp=ba3677e04d64c67955c5f716f0b089e5d63d5aec;hb=5b63545e9b35c41f8130ecce5d3e787fad74478a;hpb=bccd4cc0dba0f89aa045b113bac46eb8cc1dab4e

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index ba3677e0..e0e6dc03 100755
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -7,6 +7,7 @@
 # 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/wpia-gigi}
 
@@ -26,7 +27,7 @@ runGigiClass() {
         java_opts="$1"
         shift
     fi
-    exec java $java_opts -cp "$JDBC_DRIVER:$GIGI_EXEC" club.wpia.gigi.$class "$@"
+    exec java $java_opts -cp "$JDBC_DRIVER:$DNSJAVA:$GIGI_EXEC" club.wpia.gigi.$class "$@"
 }
 
 command="$1"
@@ -35,7 +36,7 @@ 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 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/wpia-gigi.pid
@@ -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