From c12501b63df9b57e74a16445116560ae083fb13e Mon Sep 17 00:00:00 2001 From: Matt Coddington Date: Fri, 9 Mar 2012 17:32:45 -0500 Subject: [PATCH 1/2] added rsync copy example --- other/examples/remote/rsync/copy | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 other/examples/remote/rsync/copy diff --git a/other/examples/remote/rsync/copy b/other/examples/remote/rsync/copy new file mode 100755 index 00000000..ca1f1959 --- /dev/null +++ b/other/examples/remote/rsync/copy @@ -0,0 +1,30 @@ +#!/bin/sh +# +# 2012 Matt Coddington (mcoddington 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 . +# +# +# Use rsync to copy files. This particular invocation of rsync makes +# a backup of the file before overwriting it. For example, if cdist +# overwrites /etc/passwd then you'll end up with the old copy at +# /etc/passwd~cdist +# +# Usage: +# __remote_copy="/path/to/this/script" cdist config target_host +# + +rsync --backup --suffix=~cdist -e 'ssh -i /root/.ssh/cdist -o User=root' $@ From 9ef7482ec1669f78c174d8042768b37ad4c90b72 Mon Sep 17 00:00:00 2001 From: Matt Coddington Date: Fri, 9 Mar 2012 17:39:54 -0500 Subject: [PATCH 2/2] remove ssh key location to simplify and match other examples --- other/examples/remote/rsync/copy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/other/examples/remote/rsync/copy b/other/examples/remote/rsync/copy index ca1f1959..f6b93c5c 100755 --- a/other/examples/remote/rsync/copy +++ b/other/examples/remote/rsync/copy @@ -18,13 +18,13 @@ # along with cdist. If not, see . # # -# Use rsync to copy files. This particular invocation of rsync makes -# a backup of the file before overwriting it. For example, if cdist -# overwrites /etc/passwd then you'll end up with the old copy at -# /etc/passwd~cdist +# Use rsync over ssh to copy files. This particular invocation of +# rsync makes a backup of the file before overwriting it. For example, +# if cdist overwrites /etc/passwd then you'll end up with the old copy +# at /etc/passwd~cdist. # # Usage: # __remote_copy="/path/to/this/script" cdist config target_host # -rsync --backup --suffix=~cdist -e 'ssh -i /root/.ssh/cdist -o User=root' $@ +rsync --backup --suffix=~cdist -e 'ssh -o User=root' $@