X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_config.c;h=6d2402b5c926047d15cd5d398864cde2dba5104e;hp=94dd440edc75d25a9242b6cfc4d0f511ecee2549;hb=643c2293a8b65f8970e3ef9ea288b20d117592f2;hpb=0ab3085f89e64eecd67d3179ea87f0463e918a10

diff --git a/src/graph_config.c b/src/graph_config.c
index 94dd440..6d2402b 100644
--- a/src/graph_config.c
+++ b/src/graph_config.c
@@ -1,3 +1,26 @@
+/**
+ * collection4 - graph_config.c
+ * Copyright (C) 2010  Florian octo Forster
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -7,11 +30,15 @@
 #include <errno.h>
 
 #include "graph_config.h"
+#include "graph.h"
 #include "graph_list.h"
 #include "oconfig.h"
 #include "common.h"
+#include "data_provider.h"
 
-#define CONFIG_FILE "/usr/lib/cgi-bin/octo/collection.conf"
+#ifndef CONFIGFILE
+# define CONFIGFILE "/etc/collection.conf"
+#endif
 
 time_t last_read_mtime = 0;
 
@@ -26,6 +53,8 @@ static int dispatch_config (const oconfig_item_t *ci) /* {{{ */
     child = ci->children + i;
     if (strcasecmp ("Graph", child->key) == 0)
       graph_config_add (child);
+    else if (strcasecmp ("DataProvider", child->key) == 0)
+      data_provider_config (child);
     else
     {
       DEBUG ("Unknown config option: %s", child->key);
@@ -39,7 +68,7 @@ static int internal_read_config (void) /* {{{ */
 {
   oconfig_item_t *ci;
 
-  ci = oconfig_parse_file (CONFIG_FILE);
+  ci = oconfig_parse_file (CONFIGFILE);
   if (ci == NULL)
     return (-1);
 
@@ -58,7 +87,7 @@ static time_t get_config_mtime (void) /* {{{ */
   int status;
 
   memset (&statbuf, 0, sizeof (statbuf));
-  status = stat (CONFIG_FILE, &statbuf);
+  status = stat (CONFIGFILE, &statbuf);
   if (status != 0)
     return (0);