Changeset 322ceb0139cf145a94006446310d0aa106998056

Timestamp:

02/11/10 03:16:05 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1265858165 +0000

git-parent:

[53540929ca978f9ac90d70d66409d40d46acf2d4]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1265858165 +0000

Message:

This allows for a

<include file="fileinsamedirasmaster.conf"/>

tp be placed anywhere in the master config of either noitd or stratcond.
The include is processed by parsing the specified file and putting all
children of the root element of the included document as replacements for
the children of the <include> node itself.

Special care is taken to make it look like we did not do this when we go to
write the config anywhere.

refs #254

Files:

• src/Makefile.in (modified) (1 diff)
• src/config_templates.conf (added)
• src/noit.conf.in (modified) (1 diff)
• src/noit_conf.c (modified) (9 diffs)

src/Makefile.in

@@ -226 +226 @@
-        $(INSTALL) -m 0755 noitd $(DESTDIR)$(sbindir)/noitd
-        $(INSTALL) -m 0644 noit.conf $(DESTDIR)$(sysconfdir)/noit.conf.sample
+        $(INSTALL) -m 0644 config_templates.conf $(DESTDIR)$(sysconfdir)/config_templates.conf
-        $(INSTALL) -m 0644 default-ca-chain.crt $(DESTDIR)$(sysconfdir)/default-ca-chain.crt
-        (cd modules && make install-modules DESTDIR=$(DESTDIR))

src/noit.conf.in

@@ -153 +153 @@
-  </filtersets>
-  <config_templates>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  </config_templates>
-</noit>

src/noit_conf.c

@@ -53 +53 @@
-static noit_hash_table _tmp_config = NOIT_HASH_EMPTY;
-static xmlDocPtr master_config = NULL;
+static int config_include_cnt = -1;
+static struct { 
+  xmlNodePtr insertion_point;
+  xmlNodePtr old_children;
+  xmlDocPtr doc;
+  xmlNodePtr root;
+} *config_include_nodes = NULL;
+
-static char *root_node_name = NULL;
-static char master_config_file[PATH_MAX] = "";
@@ -180 +188 @@
-}
-
+void
+noit_conf_magic_separate(xmlDocPtr doc) {
+  assert(config_include_cnt != -1);
+  if(config_include_nodes) {
+    int i;
+    for(i=0; i<config_include_cnt; i++) {
+      if(config_include_nodes[i].doc) {
+        xmlNodePtr n;
+        for(n=config_include_nodes[i].insertion_point->children;
+            n; n = n->next)
+          n->parent = config_include_nodes[i].root;
+        config_include_nodes[i].insertion_point->children =
+          config_include_nodes[i].old_children;
+        xmlFreeDoc(config_include_nodes[i].doc);
+      }
+    }
+    free(config_include_nodes);
+  }
+  config_include_nodes = NULL;
+  config_include_cnt = -1;
+}
+void
+noit_conf_kansas_city_shuffle_redo(xmlDocPtr doc) {
+  if(config_include_nodes) {
+    int i;
+    for(i=0; i<config_include_cnt; i++) {
+      if(config_include_nodes[i].doc) {
+        xmlNodePtr n;
+        config_include_nodes[i].insertion_point->children =
+          config_include_nodes[i].root->children;
+        for(n=config_include_nodes[i].insertion_point->children;
+            n; n = n->next)
+          n->parent = config_include_nodes[i].insertion_point;
+      }
+    }
+  }
+}
+void
+noit_conf_kansas_city_shuffle_undo(xmlDocPtr doc) {
+  if(config_include_nodes) {
+    int i;
+    for(i=0; i<config_include_cnt; i++) {
+      if(config_include_nodes[i].doc) {
+        xmlNodePtr n;
+        for(n=config_include_nodes[i].insertion_point->children;
+            n; n = n->next)
+          n->parent = config_include_nodes[i].root;
+        config_include_nodes[i].insertion_point->children =
+          config_include_nodes[i].old_children;
+      }
+    }
+  }
+}
+int
+noit_conf_magic_mix(const char *parentfile, xmlDocPtr doc) {
+  xmlXPathContextPtr mix_ctxt = NULL;
+  xmlXPathObjectPtr pobj = NULL;
+  xmlNodePtr node;
+  int i, cnt, rv = 0;
+
+  assert(config_include_cnt == -1);
+
+  config_include_cnt = 0;
+  mix_ctxt = xmlXPathNewContext(doc);
+  pobj = xmlXPathEval((xmlChar *)"//include[@file]", mix_ctxt);
+  if(!pobj) goto out;
+  if(pobj->type != XPATH_NODESET) goto out;
+  if(xmlXPathNodeSetIsEmpty(pobj->nodesetval)) goto out;
+  cnt = xmlXPathNodeSetGetLength(pobj->nodesetval);
+  if(cnt > 0)
+    config_include_nodes = calloc(cnt, sizeof(*config_include_nodes));
+  for(i=0; i<cnt; i++) {
+    char *path, *infile;
+    node = xmlXPathNodeSetItem(pobj->nodesetval, i);
+    path = (char *)xmlGetProp(node, (xmlChar *)"file");
+    if(!path) continue;
+    if(*path == '/') infile = strdup(path);
+    else {
+      char *cp;
+      infile = malloc(PATH_MAX);
+      strlcpy(infile, parentfile, PATH_MAX);
+      for(cp = infile + strlen(infile) - 1; cp > infile; cp--) {
+        if(*cp == '/') { *cp = '\0'; break; }
+        else *cp = '\0';
+      }
+      strlcat(infile, "/", PATH_MAX);
+      strlcat(infile, path, PATH_MAX);
+    }
+    config_include_nodes[i].doc = xmlParseFile(infile);
+    if(config_include_nodes[i].doc) {
+      xmlNodePtr n;
+      config_include_nodes[i].insertion_point = node;
+      config_include_nodes[i].root = xmlDocGetRootElement(config_include_nodes[i].doc);
+      config_include_nodes[i].old_children = node->children;
+      node->children = config_include_nodes[i].root->children;
+      for(n=node->children; n; n = n->next)
+        n->parent = config_include_nodes[i].insertion_point;
+    }
+    else {
+      noitL(noit_error, "Could not load: '%s'\n", infile);
+      rv = -1;
+    }
+    free(infile);
+  }
+  config_include_cnt = cnt;
+  noitL(noit_debug, "Processed %d includes\n", config_include_cnt);
+ out:
+  if(pobj) xmlXPathFreeObject(pobj);
+  if(mix_ctxt) xmlXPathFreeContext(mix_ctxt);
+  return rv;
+}
+
-int noit_conf_load(const char *path) {
+  int rv = 0;
-  xmlDocPtr new_config;
-  xmlNodePtr root;
@@ -188 +309 @@
-    if(root_node_name) free(root_node_name);
-    root_node_name = strdup((char *)root->name);
-
+
+
+
+
+
+
-    if(xpath_ctxt) xmlXPathFreeContext(xpath_ctxt);
-
-    master_config = new_config;
+    /* mixin all the includes */
+    if(noit_conf_magic_mix(path, master_config)) rv = -1;
+
-    xpath_ctxt = xmlXPathNewContext(master_config);
-    if(path != master_config_file)
@@ -197 +326 @@
-        noitL(noit_error, "realpath failed: %s\n", strerror(errno));
-    noit_conf_mark_changed();
-
-
-
+
+
+
+
-}
-
@@ -605 +735 @@
-                                noit_console_close_xml,
-                                ncct, enc);
+  noit_conf_kansas_city_shuffle_undo(master_config);
-  xmlSaveFormatFileTo(out, master_config, "utf8", 1);
+  noit_conf_kansas_city_shuffle_redo(master_config);
-  return 0;
-}
@@ -645 +777 @@
-    return -1;
-  }
+  noit_conf_kansas_city_shuffle_undo(master_config);
-  len = xmlSaveFormatFileTo(out, master_config, "utf8", 1);
+  noit_conf_kansas_city_shuffle_redo(master_config);
-  close(fd);
-  if(len <= 0) {
@@ -674 +808 @@
-                                noit_config_log_close_xml,
-                                clv, enc);
+  noit_conf_kansas_city_shuffle_undo(master_config);
-  xmlSaveFormatFileTo(out, master_config, "utf8", 1);
+  noit_conf_kansas_city_shuffle_redo(master_config);
-  if(clv->encoded != CONFIG_RAW) {
-    noitL(noit_error, "Error logging configuration\n");
@@ -707 +843 @@
-                                noit_config_log_close_xml,
-                                clv, enc);
+  noit_conf_kansas_city_shuffle_undo(master_config);
-  xmlSaveFormatFileTo(out, master_config, "utf8", 1);
+  noit_conf_kansas_city_shuffle_redo(master_config);
-  if(clv->encoded != CONFIG_B64) {
-    noitL(noit_error, "Error logging configuration\n");
@@ -899 +1037 @@
-  }
-  if(pobj) xmlXPathFreeObject(pobj);
-
+
+
+
+
+
+
-  path = strcmp(info->path, "/") ? info->path : "";
-  snprintf(xpath, sizeof(xpath), "/%s%s", root_node_name, path);