X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fcacert-cassiopeia.init;h=b9b7ebaf160cbd999f5c9a89a661701d67d1e7db;hb=ed858b3a84289bd8893b91e1044d4fd3b4799877;hp=726d4ab76d5622e8e46019f51f0c5a45437313d6;hpb=885459050e9385a15571339791b5882c1b097292;p=cassiopeia.git

diff --git a/debian/cacert-cassiopeia.init b/debian/cacert-cassiopeia.init
index 726d4ab..b9b7eba 100644
--- a/debian/cacert-cassiopeia.init
+++ b/debian/cacert-cassiopeia.init
@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          cassiopeia
-# Required-Start:    $local_fs $network $remote_fs $syslog mysql
-# Required-Stop:     $local_fs $network $remote_fs $syslog mysql
+# Required-Start:    $local_fs $network $remote_fs $syslog
+# Required-Stop:     $local_fs $network $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: <Enter a short description of the software>
@@ -18,7 +18,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="cacert's signer software"
-NAME=cassiopeia
+NAME=cacert-cassiopeia
 DAEMON=/usr/bin/cassiopeia
 DAEMON_ARGS=
 PIDFILE=/var/run/$NAME.pid
@@ -30,6 +30,10 @@ DIR=/var/lib/cacert-gigi
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
+if [ "$START_DAEMON" = "0" ]; then
+    echo "Not starting $NAME (as configured in /etc/default/$NAME)";
+    exit 0;
+fi
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -44,7 +48,7 @@ DIR=/var/lib/cacert-gigi
 #
 do_start()
 {
-	if [ ! -f /var/lib/cacert-gigi/config.txt ]; then
+	if [ ! -f /etc/cacert/cassiopeia/cassiopeia.conf ]; then
 		echo Missing cassiopeia-configfile
                 exit 2
         fi