Further compile warning cleanups.

[onak.git] / onak-conf.h

diff --git a/onak-conf.h b/onak-conf.h
index f91057e321a67b2c11292864d578a049b32f4f68..b0387adf657a0f5c1b35c6ba6d219b07575eeae0 100644 (file)
--- a/onak-conf.h
+++ b/onak-conf.h
@@ -9,16 +9,19 @@
 #ifndef __ONAK_CONF_H_
 #define __ONAK_CONF_H_
 
-#define VERSION "0.0.4"
+#define VERSION "0.2.1"
+#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.
+ *     @thissite: Our email address that servers sync with.
+ *     @adminemail: The email address of the server admin.
+ *     @mta: The mta to invoke to send sync mails.
+ *     @syncsites: A linked list of sites we sync with.
  *
- *     @db2_dbpath: The path to the directory containing the db2 files.
+ *     @db_dir: The path to the directory containing the database files.
  * 
- *     @file_dbpath: The path to the flat file DB directory.
- *
  *     @pg_dbhost: The host that Postgres is running on.
  *     @pg_dbname: The database name.
  *     @pg_dbuser: The user we should connect as.
@@ -28,17 +31,21 @@
  *     will eventually be populated from the config file.
  */
 struct onak_config {
-       int maxkeys;
-
        /*
-        * Options for the db2 file backend.
+        * Generic options.
         */
-       char *db2_dbpath;
+       int maxkeys;
+       char *thissite;
+       char *adminemail;
+       char *mta;
+       struct ll *syncsites;
+       char *logfile;
 
        /*
-        * Options for the file backend.
+        * Options for any database backend that needs a directory, be it the
+        * file, db2 or db3 options.
         */
-       char *file_dbpath;
+       char *db_dir;
        
        /*
         * Options for the Postgres backend.
@@ -54,4 +61,18 @@ struct onak_config {
  */
 extern struct onak_config 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 cleanupconfig(void);
+
 #endif /* __ONAK_CONF_H_ */