From 4f375a03c13a7c8e00312a4ce57ff35d0d40bc5e Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Wed, 10 Jun 2015 16:50:18 +0200 Subject: [PATCH 1/5] - added COPYING info - added parameter rsync-opts work need to be done: - the rsync-opts gets ignored by cdist since the opts are --[OPTS] like and cdist takes this as a own parameter --- cdist/conf/type/__rsync/gencode-local | 22 ++++++++++++++++++- cdist/conf/type/__rsync/gencode-remote | 20 +++++++++++++++++ cdist/conf/type/__rsync/manifest | 20 +++++++++++++++++ .../type/__rsync/parameter/optional_multiple | 1 + 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 cdist/conf/type/__rsync/parameter/optional_multiple diff --git a/cdist/conf/type/__rsync/gencode-local b/cdist/conf/type/__rsync/gencode-local index 7d688115..f11f6c90 100644 --- a/cdist/conf/type/__rsync/gencode-local +++ b/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 . +# + source=$(cat "$__object/parameter/source") remote_user=$(cat "$__object/parameter/remote-user") @@ -11,7 +31,7 @@ set -- if [ -f "$__object/parameter/rsync-opts" ]; then while read opts; do set -- "$@" "$opts" - done + done < $__object/parameter/rsync-opts fi echo rsync -a \ diff --git a/cdist/conf/type/__rsync/gencode-remote b/cdist/conf/type/__rsync/gencode-remote index f8d85313..56268389 100644 --- a/cdist/conf/type/__rsync/gencode-remote +++ b/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 . +# + if [ -f "$__object/parameter/destination" ]; then destination=$(cat "$__object/parameter/destination") else diff --git a/cdist/conf/type/__rsync/manifest b/cdist/conf/type/__rsync/manifest index d25df45b..0e4cc1f4 100644 --- a/cdist/conf/type/__rsync/manifest +++ b/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 . +# + __package rsync diff --git a/cdist/conf/type/__rsync/parameter/optional_multiple b/cdist/conf/type/__rsync/parameter/optional_multiple new file mode 100644 index 00000000..fdb7cd88 --- /dev/null +++ b/cdist/conf/type/__rsync/parameter/optional_multiple @@ -0,0 +1 @@ +rsync-opts From 036f90165ea158d627a148c93c3158616dd87475 Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Thu, 11 Jun 2015 08:52:12 +0200 Subject: [PATCH 2/5] updated man.txt inserted beginning "--" in front of every rsync-opts --- cdist/conf/type/__rsync/gencode-local | 2 +- cdist/conf/type/__rsync/man.text | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cdist/conf/type/__rsync/gencode-local b/cdist/conf/type/__rsync/gencode-local index f11f6c90..8d268d7e 100644 --- a/cdist/conf/type/__rsync/gencode-local +++ b/cdist/conf/type/__rsync/gencode-local @@ -30,7 +30,7 @@ fi set -- if [ -f "$__object/parameter/rsync-opts" ]; then while read opts; do - set -- "$@" "$opts" + set -- "$@" "--$opts" done < $__object/parameter/rsync-opts fi diff --git a/cdist/conf/type/__rsync/man.text b/cdist/conf/type/__rsync/man.text index 744b4bc2..1b787dfa 100644 --- a/cdist/conf/type/__rsync/man.text +++ b/cdist/conf/type/__rsync/man.text @@ -47,6 +47,13 @@ destination:: remote-user:: Use this user instead of the default "root" for rsync operations. +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,6 +80,11 @@ __rsync otherstuff \ --destination /usr/local/bin \ --source "$__type/files/package2" +# Use rsync option --exclude +__rsync /tmp/testdir \ + --source /etc \ + --rsync-opts exclude=sshd_conf + -------------------------------------------------------------------------------- From d91b478ae06d75ba34560663519b16f19732a889 Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Thu, 11 Jun 2015 08:54:34 +0200 Subject: [PATCH 3/5] added rsync(1) in see also --- cdist/conf/type/__rsync/man.text | 1 + 1 file changed, 1 insertion(+) diff --git a/cdist/conf/type/__rsync/man.text b/cdist/conf/type/__rsync/man.text index 1b787dfa..0079a1c6 100644 --- a/cdist/conf/type/__rsync/man.text +++ b/cdist/conf/type/__rsync/man.text @@ -91,6 +91,7 @@ __rsync /tmp/testdir \ SEE ALSO -------- - cdist-type(7) +- rsync(1) COPYING From 879ddefbdf9211167795b40cd9676bce0f1a5563 Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Thu, 11 Jun 2015 11:06:24 +0200 Subject: [PATCH 4/5] added second example for additional rsync options --- cdist/conf/type/__rsync/man.text | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cdist/conf/type/__rsync/man.text b/cdist/conf/type/__rsync/man.text index 0079a1c6..b5b287e9 100644 --- a/cdist/conf/type/__rsync/man.text +++ b/cdist/conf/type/__rsync/man.text @@ -85,6 +85,12 @@ __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 + -------------------------------------------------------------------------------- From 97dc358dc65b94846c8deb8357de5f5f1ddd9b1c Mon Sep 17 00:00:00 2001 From: Dominique Roux Date: Mon, 15 Jun 2015 15:57:11 +0200 Subject: [PATCH 5/5] added new section --- cdist/conf/type/__rsync/man.text | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cdist/conf/type/__rsync/man.text b/cdist/conf/type/__rsync/man.text index b5b287e9..af39b9c5 100644 --- a/cdist/conf/type/__rsync/man.text +++ b/cdist/conf/type/__rsync/man.text @@ -47,6 +47,9 @@ 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. @@ -54,6 +57,7 @@ rsync-opts:: Write the options without the beginning "--" Can be specified multiple times. + MESSAGES -------- NONE