From 9c402d4a3ef410979e8ac9471a53e053b4df5e5d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 2 Feb 2011 21:49:01 +0100 Subject: [PATCH] Describe latest features Signed-off-by: Nico Schottelius --- HACHERS_README => HACKERS_README | 7 +++++-- README | 2 +- bin/cdist-config | 8 ++------ 3 files changed, 8 insertions(+), 9 deletions(-) rename HACHERS_README => HACKERS_README (66%) diff --git a/HACHERS_README b/HACKERS_README similarity index 66% rename from HACHERS_README rename to HACKERS_README index 908292f9..1a540f16 100644 --- a/HACHERS_README +++ b/HACKERS_README @@ -14,5 +14,8 @@ What you can do so far: # prepare use: export PATH="$PATH:$(pwd -P)/bin" -## Test config tree wrapper -cd test && ./cdist-cconfig-tree +# Test first level manifest execution +__cdist_config=$(pwd -P)/conf __cdist_target_host=ikq02.ethz.ch cdist-manifest-init + +# See what it generated +find conf/cache diff --git a/README b/README index c1247abd..585317cb 120000 --- a/README +++ b/README @@ -1 +1 @@ -HACHERS_README \ No newline at end of file +HACKERS_README \ No newline at end of file diff --git a/bin/cdist-config b/bin/cdist-config index aaba9c74..1e3b2392 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -21,6 +21,8 @@ # Print configuration directories - helper for all other scripts # +# Values can be overriden from outside, so you can +# customise paths as you like (for distributors, geeks and hackers) : ${__cdist_config:=/etc/cdist} : ${__cdist_manifest_dir:=$__cdist_config/manifests} : ${__cdist_manifest_init:=$__cdist_manifest_dir/init} @@ -31,12 +33,6 @@ : ${__cdist_cache_hosts:=$__cdist_cache_dir/hosts} : ${__cdist_cache_bin:=$__cdist_cache_dir/bin} - -# obsolete?: lib not needed, hosts replaced by manifests, modules by types -: ${__cdist_modules:=$__cdist_config/modules} -: ${__cdist_coredir:=$__cdist_config/core} - - # create basedir + tempfile for direct usage # FIXME: remove on exit : ${__cdist_tmp_dir:=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")}