UPD: Fix the debian package

diff --git a/debian/cacert-gigi-testing.cacert-gigi.init b/debian/cacert-gigi-testing.cacert-gigi.init
index 46235d439c1f64b87db2b46a39983968ca4858d1..f0730123ed9fe23caed3916302e128593ada656f 100644 (file)
--- a/debian/cacert-gigi-testing.cacert-gigi.init
+++ b/debian/cacert-gigi-testing.cacert-gigi.init
@@ -54,8 +54,7 @@ do_start()
        #   2 if daemon could not be started
         start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
                || return 1
        #   2 if daemon could not be started
         start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
                || return 1

-       start-stop-daemon -b --start --quiet --pidfile $PIDFILE --make-pidfile -d $DIR --exec $DAEMON --no-close -- \
-               $DAEMON_ARGS < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 \
+       start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec /usr/bin/gigi -- start-daemon \

                || return 2
        # The above code will not work for interpreted scripts, use the next
        # six lines below instead (Ref: #643337, start-stop-daemon(8) )
                || return 2
        # The above code will not work for interpreted scripts, use the next
        # six lines below instead (Ref: #643337, start-stop-daemon(8) )

diff --git a/debian/cacert-gigi.cacert-gigi.init b/debian/cacert-gigi.cacert-gigi.init
index d31f546a701c5e52c0f1d8de0812dfe6ff100a93..d044355f55a3084c11a5430d449b29602f924f3d 100644 (file)
--- a/debian/cacert-gigi.cacert-gigi.init
+++ b/debian/cacert-gigi.cacert-gigi.init
@@ -54,8 +54,7 @@ do_start()
        #   2 if daemon could not be started
         start-stop-daemon --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
                || return 1
        #   2 if daemon could not be started
         start-stop-daemon --start --quiet --pidfile $PIDFILE -d $DIR --exec $DAEMON --test > /dev/null \
                || return 1

-       start-stop-daemon -b --start --quiet --pidfile $PIDFILE --make-pidfile -d $DIR --exec $DAEMON --no-close -- \
-               $DAEMON_ARGS < /etc/cacert-gigi/conf.tar >> /var/log/cacert-gigi.log 2>&1 \
+       start-stop-daemon -b --start --quiet --pidfile $PIDFILE -d $DIR --exec /usr/bin/gigi -- start-daemon \

                || return 2
        # The above code will not work for interpreted scripts, use the next
        # six lines below instead (Ref: #643337, start-stop-daemon(8) )
                || return 2
        # The above code will not work for interpreted scripts, use the next
        # six lines below instead (Ref: #643337, start-stop-daemon(8) )

diff --git a/doc/scripts/gigi b/doc/scripts/gigi
index b497e4d00ab4f3eb228574910b510fd07da0270e..f0c09b983c4b355420292117af2802ccd1dae82b 100755 (executable)
--- a/doc/scripts/gigi
+++ b/doc/scripts/gigi
@@ -13,6 +13,14 @@ 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" == "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" == "signer" ] 
 then
        java -cp $JDBC_DRIVER:$GIGI_EXEC org.cacert.gigi.util.SimpleSigner