From eec3e1760cec10cdd508771ddb71efeff04cfff8 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 10 Jul 2013 22:03:30 -0700 Subject: file permissions -- no longer force restrictive chmod on the rsync of /srv/leap/[puppet|bin], because doing so messes up the permissions of /srv/leap. --- lib/leap_cli/commands/deploy.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/leap_cli/commands/deploy.rb') diff --git a/lib/leap_cli/commands/deploy.rb b/lib/leap_cli/commands/deploy.rb index 8130111..239af2a 100644 --- a/lib/leap_cli/commands/deploy.rb +++ b/lib/leap_cli/commands/deploy.rb @@ -63,7 +63,11 @@ module LeapCli node = manager.node(server.host) hiera_file = Path.relative_path([:hiera, node.name]) ssh.leap.log hiera_file + ' -> ' + node.name + ':' + dest_dir + '/hiera.yaml' - {:source => hiera_file, :dest => dest_dir + '/hiera.yaml'} + { + :source => hiera_file, + :dest => dest_dir + '/hiera.yaml', + :flags => "-rltp --chmod=u+rX,go-rwx" + } end end @@ -80,7 +84,7 @@ module LeapCli :dest => dest_dir, :excludes => "*", :includes => calculate_includes_from_files(files_to_sync), - :flags => "--relative --dirs --delete --delete-excluded --filter='protect hiera.yaml' --copy-links" + :flags => "-ltp --chmod=u+rX,go-rwx --relative --dirs --delete --delete-excluded --filter='protect hiera.yaml' --copy-links" } else nil @@ -97,7 +101,7 @@ module LeapCli :chdir => Path.platform, :excludes => '*', :includes => ['/bin', '/bin/**', '/puppet', '/puppet/**'], - :flags => "--relative --dirs --delete --copy-links" + :flags => "-rlt --relative --delete --copy-links" } end end -- cgit v1.2.3