add: more "gigi"-subcommands (with manpage)

diff --git a/debian/gigi.1 b/debian/gigi.1
index 5828370009043097031716d5276ba9bfed51a108..61b41b69361005cf4d70d775a3ac7cbcbe4c8a3b 100644 (file)
--- a/debian/gigi.1
+++ b/debian/gigi.1
@@ -27,6 +27,9 @@ is the starter for the CAcert-gigi system.
 .\" respectively.
 .SH OPTIONS
 .TP
 .\" respectively.
 .SH OPTIONS
 .TP

+.B debug
+Run the usual webdb (not forking) with opening jdwp on port 8000. You will need to pipe the config into this program.
+.TP

 .B fetch-locales
 Fetch all Translations from http://translations.cacert.org/
 .TP
 .B fetch-locales
 Fetch all Translations from http://translations.cacert.org/
 .TP


@@ -36,12 +39,11 @@ Delete the whole database contents, resetting it to default.
 .B signer
 Run the test-replacement signer (not forking).
 .TP
 .B signer
 Run the test-replacement signer (not forking).
 .TP

+.B signer-conf
+Configure the (internal) signer and the "reset-database"-tool with the config from stdin.
+.TP

 .B start
 Run the usual webdb (not forking). You will need to pipe the config into this program.
 .B start
 Run the usual webdb (not forking). You will need to pipe the config into this program.

-.\".SH SEE ALSO
-.\".BR bar (1),
-.\".BR baz (1).
-.\".br
-.\"The programs are documented fully by
-.\".IR "The Rise and Fall of a Fooish Bar" ,
-.\"available via the Info system.
+.TP
+.B start-daemon
+Run the usual webdb (forking). You will not need to pipe the config into this program. It reads the config from /etc/cacert/gigi/conf.tar

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index 0f8c1e8aad696524f9207881c3508879dbf57972..763af7cb628ee2b54e8e1ff109e2cb6baf319794 100755 (executable)
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -15,6 +15,9 @@ cd /var/lib/cacert-gigi
 if [ "$1" == "start" ]
 then
        java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher
 if [ "$1" == "start" ]
 then
        java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher

+elif [ "$1" == "debug" ]
+then
+       java -cp $JDBC_DRIVER:$GIGI_EXEC -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 org.cacert.gigi.Launcher

 elif [ "$1" == "start-daemon" ]
 then
        if [ ! -e /etc/cacert/gigi/conf.tar ]; then
 elif [ "$1" == "start-daemon" ]
 then
        if [ ! -e /etc/cacert/gigi/conf.tar ]; then


@@ -39,8 +42,12 @@ then
        tar x gigi.properties
 else
        echo "Usage: gigi <option>"
        tar x gigi.properties
 else
        echo "Usage: gigi <option>"

-       echo "start - starts gigi"
-       echo "signer - starts the simple signer"
-       echo "reset-database - resets the database"
+       echo "debug - starts gigi in debug mode (on port 8000, with config from stdin)"

        echo "fetch-locales - (re)fetch the localisation"
        echo "fetch-locales - (re)fetch the localisation"

+       echo "reset-database - resets the database"
+       echo "signer - starts the simple signer"
+       echo "signer-conf - extract config for simple signer (and reset-database) from the tar from stdin"
+       echo "start - starts gigi"
+       echo "start-daemon - starts gigi in background (using config from /etc/cacert/gigi/conf.tar)"
+

 fi
 fi