projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix db4 backend - we weren't actually providing a suitable dbfuncs struct.
[onak.git]
/
onak-conf.h
diff --git
a/onak-conf.h
b/onak-conf.h
index 44cb99d644c7dd4bec19154e61d8921703056b71..11bdbdb5bae189f683c80c77a82817b559fd2373 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,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
+53,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
+70,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.