summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-07-15 11:37:40 +0200
committervarac <varacanero@zeromail.org>2013-07-15 11:37:40 +0200
commit99952fbf6c03e324e1a85dcdf9426850fe7610b6 (patch)
tree0a729bc656ad6c0ab2e23b825cc73be03e0a8a7a
parent93e5eb7eeb11c5d07b26db6c62feb1a3471aa41b (diff)
parenteec3e1760cec10cdd508771ddb71efeff04cfff8 (diff)
Merge branch 'master' of ssh://code.leap.se/leap_cli
-rw-r--r--lib/leap_cli/commands/ca.rb8
-rw-r--r--lib/leap_cli/commands/deploy.rb10
-rw-r--r--lib/leap_cli/remote/rsync_plugin.rb2
-rw-r--r--lib/leap_cli/version.rb4
4 files changed, 14 insertions, 10 deletions
diff --git a/lib/leap_cli/commands/ca.rb b/lib/leap_cli/commands/ca.rb
index da5bee9..b5a8765 100644
--- a/lib/leap_cli/commands/ca.rb
+++ b/lib/leap_cli/commands/ca.rb
@@ -36,11 +36,11 @@ module LeapCli; module Commands
nodes = manager.filter!(args)
nodes.each_node do |node|
- if options[:force] || cert_needs_updating?(node)
- generate_cert_for_node(node)
- elsif !node.x509.use
+ if !node.x509.use
remove_file!([:node_x509_key, node.name])
remove_file!([:node_x509_cert, node.name])
+ elsif options[:force] || cert_needs_updating?(node)
+ generate_cert_for_node(node)
end
end
end
@@ -203,7 +203,7 @@ module LeapCli; module Commands
dns_names << $1 if value =~ /^DNS:(.*)$/
end
if ips.first != node.ip_address
- log :updating, "cert for node '#{node.name}' because ip_address has changed (from #{ips} to #{node.ip_address})"
+ log :updating, "cert for node '#{node.name}' because ip_address has changed (from #{ips.first} to #{node.ip_address})"
return true
elsif dns_names != dns_names_for_node(node)
log :updating, "cert for node '#{node.name}' because domain name aliases have changed (from #{dns_names.inspect} to #{dns_names_for_node(node).inspect})"
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
diff --git a/lib/leap_cli/remote/rsync_plugin.rb b/lib/leap_cli/remote/rsync_plugin.rb
index 2c89f26..48f82d3 100644
--- a/lib/leap_cli/remote/rsync_plugin.rb
+++ b/lib/leap_cli/remote/rsync_plugin.rb
@@ -14,7 +14,7 @@ module LeapCli; module Remote; module RsyncPlugin
# {:source => '', :dest => '', :flags => '', :includes => [], :excludes => []}
#
def update
- rsync = RsyncCommand.new(:logger => logger, :flags => '-a')
+ rsync = RsyncCommand.new(:logger => logger)
rsync.asynchronously(find_servers) do |server|
options = yield server
next unless options
diff --git a/lib/leap_cli/version.rb b/lib/leap_cli/version.rb
index 072dfbd..7f019c4 100644
--- a/lib/leap_cli/version.rb
+++ b/lib/leap_cli/version.rb
@@ -1,7 +1,7 @@
module LeapCli
unless defined?(LeapCli::VERSION)
- VERSION = '1.1.2'
- COMPATIBLE_PLATFORM_VERSION = '0.2.2'..'1.99'
+ VERSION = '1.1.3'
+ COMPATIBLE_PLATFORM_VERSION = '0.2.3'..'1.99'
SUMMARY = 'Command line interface to the LEAP platform'
DESCRIPTION = 'The command "leap" can be used to manage a bevy of servers running the LEAP platform from the comfort of your own home.'
LOAD_PATHS = ['lib', 'vendor/certificate_authority/lib', 'vendor/rsync_command/lib']