Add -1 to Debian package version

[onak.git] / onak-conf.h

diff --git a/onak-conf.h b/onak-conf.h
index 44cb99d644c7dd4bec19154e61d8921703056b71..16763c6d1d8ff3fc6de91a1f1a8c8159abf8069b 100644 (file)
--- a/onak-conf.h
+++ b/onak-conf.h
@@ -9,8 +9,7 @@
 #ifndef __ONAK_CONF_H_
 #define __ONAK_CONF_H_
 
 #ifndef __ONAK_CONF_H_
 #define __ONAK_CONF_H_
 

-#define VERSION "0.1.0"
-#define CONFIGFILE "/home/noodles/projects/onak/onak.conf"
+#include "keydb.h"

 
 /*
  *     struct onak_config - Runtime configuration for onak.
 
 /*
  *     struct onak_config - Runtime configuration for onak.


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

+       char *logfile;
+
+       /*
+        * Set if we're using keyd as the backend.
+        */
+       bool use_keyd;

 
        /*
         * 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 +58,14 @@ 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;
+
+       struct dbfuncs *dbbackend;

 };
 
 /*
 };
 
 /*


@@ -62,8 +75,12 @@ 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(void);
+void readconfig(const char *configfile);

 
 /*
  *     cleanupconfig - clean up the config when we're shutting down.
 
 /*
  *     cleanupconfig - clean up the config when we're shutting down.