afb-hreq: adds redirect for directories

[src/app-framework-binder.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 29d7241..a64e131 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -21,13 +21,11 @@
 
 */
 
-
 #include "../include/local-def.h"
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-
 #define AFB_CONFIG_JTYPE "AFB_config"
 
 PUBLIC  char *ERROR_LABEL[]=ERROR_LABEL_DEF;
@@ -63,7 +61,8 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) {
    
    // TBD integrate alias-dir array with config-file
    session->config->aliasdir = cliconfig->aliasdir;
-   
+   session->config->mode = cliconfig->mode;
+
    // default HTTP port
    if (cliconfig->httpdPort == 0) session->config->httpdPort=1234;
    else session->config->httpdPort=cliconfig->httpdPort;
@@ -71,6 +70,10 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) {
    // default Plugin API timeout
    if (cliconfig->apiTimeout == 0) session->config->apiTimeout=DEFLT_API_TIMEOUT;
    else session->config->apiTimeout=cliconfig->apiTimeout;
+   
+   // default AUTH_TOKEN
+   if (cliconfig->token == NULL) session->config->token= DEFLT_AUTH_TOKEN;
+   else session->config->token=cliconfig->token;
 
    // cache timeout default one hour
    if (cliconfig->cacheTimeout == 0) session->config->cacheTimeout=DEFLT_CACHE_TIMEOUT;
@@ -106,16 +109,10 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) {
        session->config->rootapi= cliconfig->rootapi;
    }
 
-   if  (cliconfig->smack == NULL) {
-       session->config->smack = "demo";
+   if  (cliconfig->ldpaths == NULL) {
+       session->config->ldpaths = PLUGIN_INSTALL_DIR;
    } else {
-       session->config->smack= cliconfig->smack;
-   }
-
-   if  (cliconfig->smack == NULL) {
-       session->config->plugins = "all";
-   } else {
-       session->config->plugins= cliconfig->plugins;
+       session->config->ldpaths= cliconfig->ldpaths;
    }
 
    // if no session dir create a default path from rootdir
@@ -184,12 +181,8 @@ PUBLIC AFB_error configLoadFile (AFB_session * session, AFB_config *cliconfig) {
       session->config->rootapi =  strdup (json_object_get_string (value));
    }
    
-   if (!cliconfig->smack && json_object_object_get_ex (AFBConfig, "smack", &value)) {
-      session->config->smack =  strdup (json_object_get_string (value));
-   }
-   
-   if (!cliconfig->plugins && json_object_object_get_ex (AFBConfig, "plugins", &value)) {
-      session->config->plugins =  strdup (json_object_get_string (value));
+   if (!cliconfig->ldpaths && json_object_object_get_ex (AFBConfig, "plugins", &value)) {
+      session->config->ldpaths =  strdup (json_object_get_string (value));
    }
 
    if (!cliconfig->setuid && json_object_object_get_ex (AFBConfig, "setuid", &value)) {
@@ -253,8 +246,7 @@ PUBLIC void configStoreFile (AFB_session * session) {
    json_object_object_add (AFBConfig, "rootdir"       , json_object_new_string (session->config->rootdir));
    json_object_object_add (AFBConfig, "rootapi"       , json_object_new_string (session->config->rootapi));
    json_object_object_add (AFBConfig, "rootbase"      , json_object_new_string (session->config->rootbase));
-   json_object_object_add (AFBConfig, "smack"         , json_object_new_string (session->config->smack));
-   json_object_object_add (AFBConfig, "plugins"       , json_object_new_string (session->config->plugins));
+   json_object_object_add (AFBConfig, "plugins"       , json_object_new_string (session->config->ldpaths));
    json_object_object_add (AFBConfig, "sessiondir"    , json_object_new_string (session->config->sessiondir));
    json_object_object_add (AFBConfig, "pidfile"       , json_object_new_string (session->config->pidfile));
    json_object_object_add (AFBConfig, "setuid"        , json_object_new_string (session->config->setuid));
@@ -303,9 +295,6 @@ PUBLIC AFB_session *configInit () {
   }
   verbose = verbosesav;
   
-  // Load Plugins
-  initPlugins (session);
-  
   return (session);
 }