From 104103af2ae7ca42f2cb66759c4620d0aa665403 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Mon, 19 Oct 2015 11:02:44 -0200 Subject: [PATCH] Rakefile: don't override $CHAKE_RSYNC_OPTIONS --- Rakefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Rakefile b/Rakefile index 88939a2..01dcd5a 100644 --- a/Rakefile +++ b/Rakefile @@ -14,11 +14,11 @@ config_file = "config/#{$SPB_ENV}/config.yaml" iptables_file = "config/#{$SPB_ENV}/iptables-filter-rules" ENV['CHAKE_TMPDIR'] = "tmp/chake.#{$SPB_ENV}" - ENV['CHAKE_SSH_CONFIG'] = ssh_config_file -ENV['CHAKE_RSYNC_OPTIONS'] = '--exclude backups' -ENV['CHAKE_RSYNC_OPTIONS'] = '--exclude src' +ENV['CHAKE_RSYNC_OPTIONS'] ||= '' +ENV['CHAKE_RSYNC_OPTIONS'] << ' ' << '--exclude backups' +ENV['CHAKE_RSYNC_OPTIONS'] << ' ' << '--exclude src' if $SPB_ENV == 'lxc' system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 | sed -e '/^softwarepublico/ !d; s/softwarepublico_//; s/_[0-9_]*/:/ ' > #{ips_file}.new") -- libgit2 0.21.2