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

rename: cdist-remote-* = remote

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

6
bin/cdist-config
View file

@ -33,7 +33,6 @@ set -au
: ${__cdist_name_code:=code} : ${__cdist_name_code:=code}
: ${__cdist_name_explorer:=explorers} : ${__cdist_name_explorer:=explorers}
: ${__cdist_name_gencode:=gencode} : ${__cdist_name_gencode:=gencode}
: ${__cdist_name_helper:=helper}
: ${__cdist_name_host:=hosts} : ${__cdist_name_host:=hosts}
: ${__cdist_name_init:=init} : ${__cdist_name_init:=init}
: ${__cdist_name_out_dir:=out_dir} : ${__cdist_name_out_dir:=out_dir}
@ -63,7 +62,6 @@ set -au
# 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}
: ${__cdist_helper_dir:=$__cdist_config/$__cdist_name_helper}
: ${__cdist_manifest_dir:=$__cdist_config/$__cdist_name_manifests} : ${__cdist_manifest_dir:=$__cdist_config/$__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_config/$__cdist_name_type}
@ -80,9 +78,9 @@ __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
# Remote config # Remote config
: ${__cdist_remote_conf_dir:=$__cdist_remote_base_dir/$__cdist_name_conf_dir} : ${__cdist_remote_conf_dir:=$__cdist_remote_base_dir/$__cdist_name_conf_dir}
: ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer} : ${__cdist_remote_explorer_dir:=$__cdist_remote_conf_dir/$__cdist_name_explorer}
: ${__cdist_remote_helper_dir:=$__cdist_remote_conf_dir/$__cdist_name_helper} : ${__cdist_remote_bin_dir:=$__cdist_remote_conf_dir/$__cdist_name_bin}
# Remote out # Remot} out
: ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir} : ${__cdist_remote_out_dir:=$__cdist_remote_base_dir/$__cdist_name_out_dir}
: ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer} : ${__cdist_remote_out_explorer_dir:=$__cdist_remote_out_dir/$__cdist_name_explorer}

11
bin/cdist-explorer-run
View file

@ -18,8 +18,7 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# FIXME: Replace * references: * breaks if there is no explorer # Run already copied explorers
# or FIXME: check that there is at least one explorer?
# #
@ -31,10 +30,4 @@ set -ue
__cdist_target_host="$1"; shift __cdist_target_host="$1"; shift
cdist-helper-exec "${__cdist_target_host}" "cdist-explorer-remote-run" "$@" cdist-run-remote "${__cdist_target_host}" "cdist-remote-explorer-run" "$@"
exit 23
# use this in cdist-helper-exec
ssh "${__cdist_remote_user}@${__cdist_target_host}" \
"${__cdist_remote_helper_dir}/cdist-explorer-remote-run" "$@"

0
bin/cdist-explorer-remote-run → bin/cdist-remote-explorer-run
View file

0
bin/cdist-remote-run → bin/cdist-run-remote
View file