mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

BREAK: rename __cdist_config to __cdist_conf_dir

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 19:01:29 +01:00
commit e6c4533464
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
HACKERS_README
View file

@ -25,7 +25,7 @@ set -x
# prepare use (only from top level directory) # prepare use (only from top level directory)
export PATH="$PATH:$(pwd -P)/bin" export PATH="$PATH:$(pwd -P)/bin"
export __cdist_config="$(pwd -P)/conf" export __cdist_conf_dir="$(pwd -P)/conf"
# Change paths so we can debug stuff :-) # Change paths so we can debug stuff :-)
export __cdist_out_dir=/tmp/localhost export __cdist_out_dir=/tmp/localhost

4
bin/cdist-bin-transfer
View file

@ -29,8 +29,8 @@ __cdist_target_host="$1"; shift
__cdist_my_remote_out_dir="$1"; shift __cdist_my_remote_out_dir="$1"; shift
# Find directory that contains cdist binaries # Find directory that contains cdist binaries
__cdist_config_path=$(which cdist-config) __cdist_conf_dir_path=$(which cdist-config)
__cdist_src_base=${__cdist_config_path%config} __cdist_src_base=${__cdist_conf_dir_path%config}
# re-create basedir so it's clean # re-create basedir so it's clean
ssh "${__cdist_remote_user}@${__cdist_target_host}" \ ssh "${__cdist_remote_user}@${__cdist_target_host}" \

8
bin/cdist-config
View file

@ -61,11 +61,11 @@ set -au
: ${__cdist_name_object_finished:=.done} : ${__cdist_name_object_finished:=.done}
# Base # Base
: ${__cdist_config:=/etc/cdist} : ${__cdist_conf_dir:=/etc/cdist}
: ${__cdist_explorer_dir:=$__cdist_config/$__cdist_name_explorer} : ${__cdist_explorer_dir:=$__cdist_conf_dir/$__cdist_name_explorer}
: ${__cdist_manifest_dir:=$__cdist_config/$__cdist_name_manifests} : ${__cdist_manifest_dir:=$__cdist_conf_dir/$__cdist_name_manifests}
: ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init} : ${__cdist_manifest_init:=$__cdist_manifest_dir/$__cdist_name_init}
: ${__cdist_type_dir:=$__cdist_config/$__cdist_name_type} : ${__cdist_type_dir:=$__cdist_conf_dir/$__cdist_name_type}
# 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_]*'