module loader implemented

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2010-09-20 02:30:16 +02:00
parent 4fe315b1e4
commit e054d0c22c
3 changed files with 35 additions and 2 deletions

View file

@ -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

View file

@ -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}"
}

24
test/test_collectd Executable file
View file

@ -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