cleanup and add vars to cdist-config

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-02 14:23:54 +01:00
parent 14ea35e40f
commit 732ac76383

View file

@ -24,8 +24,12 @@
: ${__cdist_config:=/etc/cdist} : ${__cdist_config:=/etc/cdist}
: ${__cdist_manifest_dir:=$__cdist_config/manifests} : ${__cdist_manifest_dir:=$__cdist_config/manifests}
: ${__cdist_manifest_init:=$__cdist_manifest_dir/init} : ${__cdist_manifest_init:=$__cdist_manifest_dir/init}
: ${__cdist_type_dir:=$__cdist_config/types} : ${__cdist_type_dir:=$__cdist_config/types}
: ${__cdist_cache_dir:=$__cdist_config/cache}
: ${__cdist_cache_hosts:=$__cdist_cache_dir/hosts}
# obsolete?: lib not needed, hosts replaced by manifests, modules by types # obsolete?: lib not needed, hosts replaced by manifests, modules by types
: ${__cdist_hosts:=$__cdist_config/hosts} : ${__cdist_hosts:=$__cdist_config/hosts}
@ -77,9 +81,3 @@ __cdist_usage()
#find "${__cdist_MODULES}" -name manifest > "${__cdist_TMP}" #find "${__cdist_MODULES}" -name manifest > "${__cdist_TMP}"
#set +e #set +e
#echo $__cdist_CONFIG
# FIXME: here or somewhere else? other parts may reuse tmp
: > "$__cdist_TMP"
#rm -f "$__cdist_TMP"
#__cdist_cur="$(pwd -P)"