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

cdist-config broken

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-17 17:46:18 +01:00
commit aec77a05ae
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/cdist-config
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2010 Nico Schottelius (nico-cdist at schottelius.org) # 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -21,6 +21,10 @@
# Print configuration directories - helper for all other scripts # Print configuration directories - helper for all other scripts
# #
echo teeeeeeeeeeeeeeeeeees
# Fail if something bogus is going on
set -u
# Values can be overriden from outside, so you can # Values can be overriden from outside, so you can
# customise paths as you like (for distributors, geeks and hackers) # customise paths as you like (for distributors, geeks and hackers)
@ -55,7 +59,6 @@
# Marks an object finished # Marks an object finished
: ${__cdist_name_object_finished:=.done} : ${__cdist_name_object_finished:=.done}
# Base # Base
: ${__cdist_config:=/etc/cdist} : ${__cdist_config:=/etc/cdist}
: ${__cdist_explorer_dir:=$__cdist_config/$__cdist_name_explorer} : ${__cdist_explorer_dir:=$__cdist_config/$__cdist_name_explorer}
@ -71,13 +74,17 @@
# Remote # Remote
: ${__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 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 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 need to be recreated for each individual script, unshared!
__cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX") __cdist_tmp_dir=$(mktemp -d "/tmp/cdist.XXXXXXXXXXXX")

3
bin/cdist-deploy-to
View file

@ -23,8 +23,7 @@
. cdist-config . cdist-config
[ $# -eq 1 ] || __cdist_usage "<target host>" [ $# -eq 1 ] || __cdist_usage "<target host>"
set -eu
set -e
__cdist_target_host="$1" __cdist_target_host="$1"