upd: Prevent unconfigured startup by checking service defaults

diff --git a/Makefile b/Makefile
index cfa9b76ae771ecda771fefe4b895052f6cd22f49..ed3e56858ef6fe70bf9326596ae4720046a4967d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,6 +84,7 @@ endif
 .PHONY: install
 install: build
        ${INSTALL_PROGRAM} bin/cassiopeia ${DESTDIR}/usr/bin/cassiopeia
+       ${INSTALL_DIR} ${DESTDIR}/etc/cacert/cassiopeia
 
 .PHONY: libs
 libs: ${LIBS}

diff --git a/debian/cacert-cassiopeia.default b/debian/cacert-cassiopeia.default
new file mode 100644 (file)
index 0000000..436a32a
--- /dev/null
+++ b/debian/cacert-cassiopeia.default
@@ -0,0 +1 @@
+START_DAEMON=0

diff --git a/debian/cacert-cassiopeia.init b/debian/cacert-cassiopeia.init
index 5ce7b2ac4733e5514270a9963a2a26282683e3d3..bc5b464d8cc2ee2670ac852eee736532a0a63e3a 100644 (file)
--- a/debian/cacert-cassiopeia.init
+++ b/debian/cacert-cassiopeia.init
@@ -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,9 +48,9 @@ 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 0
+                exit 2
         fi
        # Return
        #   0 if daemon has been started

diff --git a/debian/cacert-cassiopeia.install b/debian/cacert-cassiopeia.install
index 85d1e469a7173438950ce19e0bd952deea9f6bdc..63e3122d0ecfee81ed036ce863aa0ec04299bfb7 100644 (file)
--- a/debian/cacert-cassiopeia.install
+++ b/debian/cacert-cassiopeia.install
@@ -1 +1,2 @@
 /usr/bin/cassiopeia
+/etc/cacert/cassiopeia

diff --git a/src/main.cpp b/src/main.cpp
index aed34a2d7cec5537ba95fae4ba8236a1a0561304..cf4f383d843e396b1850e87e2a2aeccc05a9eea9 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,7 +45,11 @@ int main( int argc, const char* argv[] ) {
     }
 
     std::ifstream config;
-    config.open( "config.txt" );
+    if(DAEMON){
+      config.open( "/etc/cacert/cassiopeia/cassiopeia.conf" );
+    }else{
+      config.open( "config.txt" );
+    }
 
     if( !config.is_open() ) {
         std::cerr << "config missing" << std::endl;