Merge branch 'remote_prefix'

doc/changelog

@@ -10,6 +10,7 @@ Changelog
 
 2.0.11: 2012-05-23
 	* Fix insecure file/directory creation: Use umask 077
+	* Add support for --remote-exec and --remote-copy parameters
 
 2.0.10: 2012-05-18
 	* Cleanup __group: No getent gshadow in old Redhat, use groupmod -g

doc/man/man1/cdist.text

@@ -41,23 +41,29 @@ CONFIG
 Configure a system
 
 -h, --help::
-   Show the help screen
+    Show the help screen
 
 -c CDIST_HOME, --cdist-home CDIST_HOME::
-   Instead of using the parent of the bin directory as cdist home,
-   use the specified directory
+    Instead of using the parent of the bin directory as cdist home,
+    use the specified directory
 
 -d, --debug::
-   Enable debug output
+    Enable debug output
 
 -i MANIFEST, --initial-manifest MANIFEST::
-   Path to a cdist manifest or - to read from stdin
+    Path to a cdist manifest or - to read from stdin
 
 -p, --parallel::
-   Operate on multiple hosts in parallel
+    Operate on multiple hosts in parallel
 
 -s, --sequential::
-   Operate on multiple hosts sequentially
+    Operate on multiple hosts sequentially
+
+--remote-copy REMOTE_COPY:
+    Command to use for remote copy (should behave like scp)
+
+--remote-exec REMOTE_EXEC:
+    Command to use for remote execution (should behave like ssh)
 
 
 EXAMPLES
@@ -69,7 +75,12 @@ cdist config -d ikq05.ethz.ch
 
 # Configure hosts in parallel and use a different home directory
 cdist config -c ~/p/cdist-nutzung \
-   -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
+    -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
+
+# Use custom remote exec / copy commands
+cdist config --remote-exec /path/to/my/remote/exec \
+    --remote-copy /path/to/my/remote/copy \
+    -p ikq02.ethz.ch ikq03.ethz.ch ikq04.ethz.ch
 
 # Display banner
 cdist banner
@@ -98,7 +109,7 @@ The following exit values shall be returned:
 0::
     Successful completion
 1::
-    One or more host configuration failed.
+    One or more host configurations failed
 
 
 SEE ALSO

doc/man/man7/cdist-remote-exec-copy.text

@@ -0,0 +1,46 @@
+cdist-remote-exec-copy(7)
+=========================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-remote-exec-copy - How to use remote exec and copy
+
+
+INTRO
+-----
+Cdist interacts with the target host in two ways:
+- it executes code (__remote_exec)
+- and it copies files (__remote_copy)
+
+By default this is accomplished with ssh and scp respectively.
+The default implementations used by cdist are:
+__remote_exec: ssh -o User=root -q
+__remote_copy: scp -o User=root -q
+
+The user can override these defaults by providing custom implementations and
+passing them to cdist with the --remote-exec and/or --remote-copy arguments.
+
+For __remote_exec, the custom implementation must behave as if it where ssh.
+For __remote_copy, it must behave like scp.
+
+With this simple interface the user can take total control of how cdist
+interacts with the target when required, while the default implementation 
+remains as simple as possible.
+
+
+EXAMPLES
+--------------
+See cdist/other/examples/remote/ for some example implementations.
+
+
+SEE ALSO
+--------
+- cdist(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011-2012 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).