X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=doc%2Fscripts%2Fgigi;h=dd09c691bb2b57fb7b431d2b98288c285eec5232;hp=b497e4d00ab4f3eb228574910b510fd07da0270e;hb=1c3386cb61b122710799527451391a1cb7f850ff;hpb=74b367ff84986a90499bf7421156be5834ca8365

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index b497e4d0..dd09c691 100755
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$JDBC_DRIVER" == "" ]
 then
-JDBC_DRIVER=/usr/share/java/mysql-connector-java.jar
+JDBC_DRIVER=/usr/share/java/postgresql-jdbc4.jar
 #echo "JDBC_DRIVER environment variable not set. Assumed path: $JDBC_DRIVER"
 fi
 if [ "$GIGI_EXEC" == "" ]
@@ -9,17 +9,30 @@ then
 GIGI_EXEC=/usr/share/java/gigi.jar
 #echo "GIGI_EXEC environment variable not set. Assumed path: $GIGI_EXEC" 
 fi
+
 cd /var/lib/cacert-gigi
+
 if [ "$1" == "start" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher
-elif [ "$1" == "signer" ] 
+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
+		echo "Config missing."
+		exit 1;
+	fi
+	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.Launcher < /etc/cacert/gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 &
+	echo $! > /var/run/cacert-gigi.pid
+elif [ "$1" == "signer" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.SimpleSigner
-elif [ "$1" == "reset-database" ] 
+elif [ "$1" == "reset-database" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.DatabaseManager
-elif [ "$1" == "fetch-locales" ] 
+elif [ "$1" == "fetch-locales" ]
 then
 	java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.FetchLocales
 elif [ "$1" == "signer-conf" ]
@@ -29,8 +42,12 @@ then
 	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 "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