rouxdo/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove exports from cdist-config, let subscribts take care about that, add out_dir

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 16:01:18 +01:00
parent 5957de201b
commit 17838de1ef
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bin/cdist-config
View file

@ -35,6 +35,7 @@ set -u
: ${__cdist_name_gencode:=gencode} : ${__cdist_name_gencode:=gencode}
: ${__cdist_name_host:=hosts} : ${__cdist_name_host:=hosts}
: ${__cdist_name_init:=init} : ${__cdist_name_init:=init}
: ${__cdist_name_out_dir:=out_dir}
# Name of the manifest file in types # Name of the manifest file in types
: ${__cdist_name_manifest:=manifest} : ${__cdist_name_manifest:=manifest}
@ -72,30 +73,27 @@ set -u
# Used for IDs # Used for IDs
__cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*' __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
# Remote
# Default remote user # Default remote user
: ${__cdist_remote_user:=root} : ${__cdist_remote_user:=root}
# Remote paths
: ${__cdist_remote_base_dir:=/var/lib/cdist} : ${__cdist_remote_base_dir:=/var/lib/cdist}
export __cdist_remote_base_dir
: ${__cdist_remote_explorer_dir:=$__cdist_remote_base_dir/$__cdist_name_explorer} : ${__cdist_remote_explorer_dir:=$__cdist_remote_base_dir/$__cdist_name_explorer}
export __cdist_remote_explorer_dir
: ${__cdist_remote_cache_dir:=$__cdist_remote_base_dir/$__cdist_name_cache} : ${__cdist_remote_cache_dir:=$__cdist_remote_base_dir/$__cdist_name_cache}
export __cdist_remote_cache_dir
: ${__cdist_remote_cache_explorer:=$__cdist_remote_cache_dir/$__cdist_name_explorer} : ${__cdist_remote_cache_explorer:=$__cdist_remote_cache_dir/$__cdist_name_explorer}
export __cdist_remote_cache_explorer
: ${__cdist_remote_cache_bin:=$__cdist_remote_base_dir/$__cdist_name_bin} : ${__cdist_remote_cache_bin:=$__cdist_remote_base_dir/$__cdist_name_bin}
export __cdist_remote_cache_bin
: ${__cdist_remote_cache_exec:=$__cdist_remote_base_dir/$__cdist_name_exec} : ${__cdist_remote_cache_exec:=$__cdist_remote_base_dir/$__cdist_name_exec}
export __cdist_remote_cache_exec
# Tempfiles need to be recreated for each individual script, unshared! # Tempfiles
__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX") __cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")
export __cdist_tmp_dir export __cdist_tmp_dir
__cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX") __cdist_tmp_file=$(mktemp "$__cdist_tmp_dir/cdist.XXXXXXXXXXXX")
export __cdist_tmp_file export __cdist_tmp_file
# Local output base directory
: ${__cdist_out_dir:=$__cdist_tmp_dir/$__cdist_name_out_dir}
################################################################################ ################################################################################
# cconf standard vars prefixed with cdist # cconf standard vars prefixed with cdist
__cdist_pwd="$(pwd -P)" __cdist_pwd="$(pwd -P)"