From 69fc63df1e99309111b870a7239abf49cc94ba4c Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sun, 20 Mar 2011 02:44:31 +0100
Subject: [PATCH] export __target_user to non-core

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-config                | 2 ++
 bin/cdist-deploy-to             | 1 +
 doc/dev/todo/post-1.3           | 4 ++--
 doc/man/cdist-reference.text.sh | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/cdist-config b/bin/cdist-config
index 23b24025..676a743c 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -63,6 +63,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_require:=require}
 : ${__cdist_name_singleton:=singleton}
 : ${__cdist_name_target_host:=target_host}
+: ${__cdist_name_target_user:=target_user}
 : ${__cdist_name_type:=type}
 : ${__cdist_name_type_bin:=type_bin}
 : ${__cdist_name_type_explorer:=type_explorer}
@@ -82,6 +83,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_var_global:=__$__cdist_name_global}
 : ${__cdist_name_var_manifest:=__$__cdist_name_manifest}
 : ${__cdist_name_var_target_host:=__$__cdist_name_target_host}
+: ${__cdist_name_var_target_user:=__$__cdist_name_target_user}
 : ${__cdist_name_var_object:=__$__cdist_name_object}
 : ${__cdist_name_var_object_id:=__$__cdist_name_object_id}
 : ${__cdist_name_var_type:=__$__cdist_name_type}
diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index 551575c3..a288b189 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -29,6 +29,7 @@ __cdist_target_host="$1"
 
 # Make target host available for non-core
 export $__cdist_name_var_target_host="$__cdist_target_host"
+export $__cdist_name_var_target_user="$__cdist_remote_user"
 
 # Export variables for core, which others do not reset
 export __cdist_local_base_dir
diff --git a/doc/dev/todo/post-1.3 b/doc/dev/todo/post-1.3
index 61adacc7..3a23d44d 100644
--- a/doc/dev/todo/post-1.3
+++ b/doc/dev/todo/post-1.3
@@ -1,9 +1,10 @@
 Core:
    - write test case: test.sh
+   - doc/man/cdist-reference.text.sh: use static version from cdist-config
    - export remote user name -> $__user
 
 Types to be written/extended:
-   - __ssh-keys (host/user)
+   j __ssh-keys (host/user)
    - __service
    - __file_edit
       - regexp replace (can probably cover all?)
@@ -19,5 +20,4 @@ Documentation:
       - cdist-trigger after first run from /var/lib/cdist/out/bin?
    - Different environments (production, integration, development)
       - via version control
-   - Check all references in manpages, ensure all manpages exist
    - Ensure html output of manpages are published on the web
diff --git a/doc/man/cdist-reference.text.sh b/doc/man/cdist-reference.text.sh
index 8fdd831c..2c1f03c7 100755
--- a/doc/man/cdist-reference.text.sh
+++ b/doc/man/cdist-reference.text.sh
@@ -169,6 +169,9 @@ __object_id::
 __target_host::
    The host we are deploying to.
    Available for: initial manifest, type manifest, type codegen
+__target_user::
+   User to use for authentication on remote host.
+   Currently static in core.
 __type::
    Path to the current type.
    Available for: type manifest