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

a giant commit into the future

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-23 16:45:38 +01:00
commit 995bf8d963
6 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

38
conf/helper/cdist-explorer-remote-run
View file

@ -1,6 +1,6 @@
#!/bin/sh
#
# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
@ -18,36 +18,32 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
# FIXME: Replace * references: * breaks if there is no explorer
# or FIXME: check that there is at least one explorer?
#
. cdist-config
if [ $# -lt 3 ]; then
__cdist_usage "<target host> <remote srcdir> <remote dstdir> [explorer args]"
__cdist_usage "<work dir> <explorer dir> <out dir> [explorer args]"
fi
set -ue
__cdist_target_host="$1"; shift
__cdist_remote_src_dir="$1"; shift
__cdist_remote_dst_dir="$1"; shift
# cd to this dir
__cdist_work_dir="$1"; shift
# Create remote destination directory
ssh "${__cdist_remote_user}@${__cdist_target_host}" \
"mkdir -p \"${__cdist_remote_dst_dir}\""
# find explorers here
__cdist_explorer_dir="$1"; shift
# FIXME: enable -q as soon as the code is cleaned up
cd "${__cdist_local_src_dir}"
# write output here
__cdist_my_out_dir="$1"; shift
cd "${__cdist_work_dir}"
# Ensure there is at least one explorer
num="$(ls -1 | wc -l)"
num="$(ls -1 "$__cdist_explorer_dir" | wc -l)"
if [ "$num" -lt 1 ]; then
__cdist_exit_err "${__cdist_local_src_dir}: Contains no explorers"
__cdist_exit_err "${__cdist_explorer_dir}: Contains no explorers"
fi
# Execute all explorers
for explorer in *; do
for explorer in "$__cdist_explorer_dir/"*; do
if [ -f "$explorer" ]; then
if [ ! -x "$explorer" ]; then
echo "Explorer \"$explorer\" exists, but is not executable."
@ -55,9 +51,7 @@ for explorer in *; do
fi
# Execute explorers and save results in remote destination directory
ssh "${__cdist_remote_user}@${__cdist_target_host}" \
"cd \"${__cdist_remote_src_dir}\" && \"./$explorer\" > \
\"${__cdist_remote_dst_dir}/${explorer}\"" "$@"
"$explorer" "$@" > "${__cdist_my_out_dir}"
else
if [ -e "$explorer" ]; then
echo "Explorer \"$explorer\" exists, but is not a file."
@ -65,7 +59,3 @@ for explorer in *; do
fi
fi
done
# Copy results back to us
scp "${__cdist_remote_user}@${__cdist_target_host}:${__cdist_remote_dst_dir}/*" \
"$__cdist_local_dst_dir"