Make failure to load backend fatal.

[onak.git] / onak-conf.h

diff --git a/onak-conf.h b/onak-conf.h
index 11458187fad6dcf259407976419ff5e294316b85..0a36c9adf6733344b73fecd0e48ecc540f8f8218 100644 (file)
--- a/onak-conf.h
+++ b/onak-conf.h
@@ -9,9 +9,6 @@
 #ifndef __ONAK_CONF_H_
 #define __ONAK_CONF_H_
 
 #ifndef __ONAK_CONF_H_
 #define __ONAK_CONF_H_
 

-#define VERSION "0.0.4"
-#define CONFIGFILE "/home/noodles/projects/onak/onak.conf"
-

 /*
  *     struct onak_config - Runtime configuration for onak.
  *     @maxkeys: The maximum number of keys a query should return.
 /*
  *     struct onak_config - Runtime configuration for onak.
  *     @maxkeys: The maximum number of keys a query should return.


@@ -39,6 +36,7 @@ struct onak_config {
        char *adminemail;
        char *mta;
        struct ll *syncsites;
        char *adminemail;
        char *mta;
        struct ll *syncsites;

+       char *logfile;

 
        /*
         * Options for any database backend that needs a directory, be it the
 
        /*
         * Options for any database backend that needs a directory, be it the


@@ -53,6 +51,12 @@ struct onak_config {
        char *pg_dbname;
        char *pg_dbuser;
        char *pg_dbpass;
        char *pg_dbname;
        char *pg_dbuser;
        char *pg_dbpass;

+
+       /*
+        * Options for the dynamic backend.
+        */
+       char *db_backend;
+       char *backends_dir;

 };
 
 /*
 };
 
 /*


@@ -62,7 +66,16 @@ extern struct onak_config config;
 
 /*
  *     readconfig - read the onak config.
 
 /*
  *     readconfig - read the onak config.

+ *     @configfile - the config file to read.
+ *
+ *     Read in our config file. If config file is NULL read in the compile
+ *     time default.
+ */
+void readconfig(const char *configfile);
+
+/*
+ *     cleanupconfig - clean up the config when we're shutting down.

  */
  */

-void readconfig(void);
+void cleanupconfig(void);

 
 #endif /* __ONAK_CONF_H_ */
 
 #endif /* __ONAK_CONF_H_ */