From e054d0c22ce7b303c08c0821a3f997ef9346ed20 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Mon, 20 Sep 2010 02:30:16 +0200
Subject: [PATCH] module loader implemented

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config               |  9 +++++++++
 conf/modules/collectd/manifest |  4 ++--
 test/test_collectd             | 24 ++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100755 test/test_collectd

diff --git a/bin/cdist-config b/bin/cdist-config
index 8ead5726..935071af 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -25,6 +25,7 @@
 : ${CDIST_COREDIR:=$CDIST_CONFIG/core}
 : ${CDIST_LIBDIR:=$CDIST_CONFIG/lib}
 : ${CDIST_HOSTS:=$CDIST_CONFIG/hosts}
+: ${CDIST_MODULES:=$CDIST_CONFIG/modules}
 
 set -e
 
@@ -34,6 +35,14 @@ cd "${CDIST_LIBDIR}"
 for __cdist_lib in *; do
    . "./${__cdist_lib}"
 done
+
+# load modules
+cd "${CDIST_MODULES}"
+for __cdist_mod in *; do
+   . "./${__cdist_mod}/manifest"
+done
+
+
 set +e
 
 #echo $CDIST_CONFIG
diff --git a/conf/modules/collectd/manifest b/conf/modules/collectd/manifest
index 03f7471b..abd2eb79 100644
--- a/conf/modules/collectd/manifest
+++ b/conf/modules/collectd/manifest
@@ -23,6 +23,6 @@ collectd()
 {
    config_source="${1:-modules/collectd/collectd.conf}"
 
-   cdist_package collectd
-   cdist_file /etc/collectd/collectd.conf "${config_source}"
+   echo cdist_package collectd
+   echo cdist_file /etc/collectd/collectd.conf "${config_source}"
 }
diff --git a/test/test_collectd b/test/test_collectd
new file mode 100755
index 00000000..a3bb1d7c
--- /dev/null
+++ b/test/test_collectd
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+. cdist-config
+
+collectd