forked from ungleich-public/cdist
construct cache dir path in cdist-config, not cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
e7ff4c37ff
commit
dd176d7a64
2 changed files with 21 additions and 6 deletions
|
|
@ -105,6 +105,8 @@ __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
|
|||
# Local Base
|
||||
#
|
||||
: ${__cdist_local_base_dir:=$__cdist_tmp_dir}
|
||||
|
||||
# Cache may *NOT* be below __cdist_local_base_dir!
|
||||
: ${__cdist_local_base_cache_dir:=$__cdist_abs_mydir/../$__cdist_name_cache}
|
||||
|
||||
: ${__cdist_conf_dir:="$(cd "$__cdist_abs_mydir/../conf" && pwd -P)"}
|
||||
|
|
@ -186,6 +188,19 @@ __cdist_init_deploy()
|
|||
ln -sf "$__cdist_conf_dir" "$__cdist_local_base_dir/$__cdist_name_conf_dir"
|
||||
}
|
||||
|
||||
################################################################################
|
||||
# Cache
|
||||
#
|
||||
__cdist_cache_dir()
|
||||
{
|
||||
cd "${__cdist_local_base_cache_dir}" && pwd -P
|
||||
}
|
||||
|
||||
__cdist_host_cache_dir()
|
||||
{
|
||||
echo "$(__cdist_cache_dir)/$1"
|
||||
}
|
||||
|
||||
################################################################################
|
||||
# Object
|
||||
#
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue