diff options
| author | elijah <elijah@riseup.net> | 2013-07-10 10:24:10 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-10 10:24:10 -0700 |
| commit | 7f4dea648d1f5a6b357933706abdb0f902043172 (patch) | |
| tree | 660f7913f51c4e2c9c5dcd51b590bd81317401a7 | |
| parent | 98839b3158b0f2cd7fab3ce277a531b13fe9fc75 (diff) | |
| download | leap_cli-7f4dea648d1f5a6b357933706abdb0f902043172.tar.gz leap_cli-7f4dea648d1f5a6b357933706abdb0f902043172.tar.bz2 | |
fixed bug where unused certs were not being deleted.
| -rw-r--r-- | lib/leap_cli/commands/ca.rb | 8 |
1 files changed, 4 insertions, 4 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})" |