read cert and key paths from CLI

diff --git a/org.glite.jp.index/config/startup b/org.glite.jp.index/config/startup
index 97ecde1..2596cdb 100755 (executable)
--- a/org.glite.jp.index/config/startup
+++ b/org.glite.jp.index/config/startup
@@ -60,25 +60,23 @@ start()
                 echo FAILED
                 return 1
         fi
-if [ ! -d "`dirname $GLITE_JPIS_PIDFILE`" ] 
-then 
-       echo "Directory `dirname $GLITE_JPIS_PIDFILE` does not exist!"
-       exit 1
-fi
-if [ ! -d "`dirname $GLITE_JPIS_LOGFILE`" ]
-then
-       echo "Directory `dirname $GLITE_JPIS_LOGFILE` does not exist!"
-       exit 1
-fi
-
-
+       if [ ! -d "`dirname $GLITE_JPIS_PIDFILE`" ] 
+       then 
+               echo "Directory `dirname $GLITE_JPIS_PIDFILE` does not exist!"
+               exit 1
+       fi
+       if [ ! -d "`dirname $GLITE_JPIS_LOGFILE`" ]
+       then
+               echo "Directory `dirname $GLITE_JPIS_LOGFILE` does not exist!"
+               exit 1
+       fi
 
 
        echo -n Starting glite-jp-indexd ...
        #su  " $GLITE_LOCATION/bin/glite-jp-indexd \
        su - $GLITE_USER -c " $GLITE_LOCATION/bin/glite-jp-indexd \
                -s $GLITE_JPIS_PS $GLITE_JPIS_DEBUG \
-               -q $GLITE_JPIS_QT $GLITE_JPIS_AUTH \
+               -q $GLITE_JPIS_QT $creds $GLITE_JPIS_AUTH \
                -m $GLITE_JPIS_DB -p $GLITE_JPIS_PORT \
                -i $GLITE_JPIS_PIDFILE -o $GLITE_JPIS_LOGFILE \
                " && echo " done" || echo " FAILED"

diff --git a/org.glite.jp.index/src/bones_server.c b/org.glite.jp.index/src/bones_server.c
index 7f12a4e..e5ae981 100644 (file)
--- a/org.glite.jp.index/src/bones_server.c
+++ b/org.glite.jp.index/src/bones_server.c
@@ -159,6 +159,9 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       server_cert = conf->server_cert;
+       server_key = conf->server_key;
+
        if (!server_cert || !server_key)
                fprintf(stderr, "%s: WARNING: key or certificate file not specified, "
                                "can't watch them for changes\n",

diff --git a/org.glite.jp.index/src/conf.c b/org.glite.jp.index/src/conf.c
index be2da5d..3bed992 100644 (file)
--- a/org.glite.jp.index/src/conf.c
+++ b/org.glite.jp.index/src/conf.c
@@ -22,8 +22,8 @@ static struct option opts[] = {
        {"is-server",   1, NULL,        's'},
        {"debug",       0, NULL,        'd'},
        {"query-type",  1, NULL,        'q'},
-//     {"cert",        1, NULL,        'c'},
-//     {"key",         1, NULL,        'k'},
+       {"cert",        1, NULL,        'c'},
+       {"key",         1, NULL,        'k'},
 //     {"CAdir",       1, NULL,        'C'},
 //     {"VOMSdir",     1, NULL,        'V'},
        {"noauth",      0, NULL,        'n'},
@@ -42,8 +42,8 @@ static void usage(char *me)
                "\t-s, --ps-server\t primary storage server address (http://hostname:port)\n"
                "\t-d, --debug\t don't run as daemon, additional diagnostics\n"
                "\t-q, --query-type hist/cont/both (default history)\n"
-//             "\t-k, --key\t private key file\n" 
-//             "\t-c, --cert\t certificate file\n"
+               "\t-k, --key\t private key file\n" 
+               "\t-c, --cert\t certificate file\n"
 //             "\t-C, --CAdir\t trusted certificates directory\n"
 //             "\t-V, --VOMSdir\t trusted VOMS servers certificates directory\n"
                "\t-n, --noauth\t don't check user identity with result owner\n"
@@ -70,8 +70,8 @@ int glite_jp_get_conf(int argc, char **argv, char *config_file, glite_jp_is_conf
                case 's': ps = optarg; break;
                case 'd': conf->debug = 1; break;
                case 'q': qt = optarg; break;
-//             case 'c': server_cert = optarg; break;
-//             case 'k': server_key = optarg; break;
+               case 'c': conf->server_cert = optarg; break;
+               case 'k': conf->server_key = optarg; break;
 //             case 'C': cadir = optarg; break;
 //             case 'V': vomsdir = optarg; break;
                case 'n': conf->no_auth = 1; break;

diff --git a/org.glite.jp.index/src/conf.h b/org.glite.jp.index/src/conf.h
index 058fd06..228ef07 100644 (file)
--- a/org.glite.jp.index/src/conf.h
+++ b/org.glite.jp.index/src/conf.h
@@ -34,7 +34,9 @@ typedef struct _glite_jp_is_conf {
        char    *cs,                    // database contact string
                *port,                  // server port
                *pidfile,
-               *logfile;
+               *logfile,
+               *server_cert,
+               *server_key;
 } glite_jp_is_conf;