Merge remote-tracking branch 'telmich/master'

cdist/conf/type/__rsync/gencode-local

@@ -1,3 +1,23 @@
+#!/bin/sh
+#
+# 2015 Dominique Roux (dominique.roux4 at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
 source=$(cat "$__object/parameter/source")
 remote_user=$(cat "$__object/parameter/remote-user")
 
@@ -10,8 +30,8 @@ fi
 set --
 if [ -f "$__object/parameter/rsync-opts" ]; then
     while read opts; do
-        set -- "$@" "$opts"
-    done
+        set -- "$@" "--$opts"
+    done < $__object/parameter/rsync-opts
 fi
 
 echo rsync -a \

cdist/conf/type/__rsync/gencode-remote

@@ -1,3 +1,23 @@
+#!/bin/sh
+#
+# 2015 Dominique Roux (dominique.roux4 at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
 if [ -f "$__object/parameter/destination" ]; then
     destination=$(cat "$__object/parameter/destination")
 else

cdist/conf/type/__rsync/man.text

@@ -47,6 +47,17 @@ destination::
 remote-user::
     Use this user instead of the default "root" for rsync operations.
 
+
+OPTIONAL MULTIPLE PARAMETERS
+----------------------------
+rsync-opts::
+    Use this option to give rsync options with.
+    See rsync(1) for available options.
+    Only "--" options are supported.
+    Write the options without the beginning "--"
+    Can be specified multiple times.
+
+
 MESSAGES
 --------
 NONE
@@ -73,12 +84,24 @@ __rsync otherstuff \
     --destination /usr/local/bin \
     --source "$__type/files/package2"
 
+# Use rsync option --exclude
+__rsync /tmp/testdir \
+    --source /etc \
+    --rsync-opts exclude=sshd_conf
+
+# Use rsync with multiple options --exclude --dry-run
+__rsync /tmp/testing \
+    --source /home/tester \
+    --rsync-opts exclude=id_rsa \
+    --rsync-opts dry-run
+
 
 --------------------------------------------------------------------------------
 
 SEE ALSO
 --------
 - cdist-type(7)
+- rsync(1)
 
 
 COPYING

cdist/conf/type/__rsync/manifest

@@ -1 +1,21 @@
+#!/bin/sh
+#
+# 2015 Dominique Roux (dominique.roux4 at gmail.com)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
 __package rsync

cdist/conf/type/__rsync/parameter/optional_multiple

@@ -0,0 +1 @@
+rsync-opts