vagrant-rekey-ssh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2NjY2FkMjVlYTI1Zjg0N2M1OTE0OWQ4M2I5NzA1YTYyMDAxMzVlZQ==
+    NTkyMzA1ZGQ2YjAwYzI5MDVlYjY0MmZmY2E4Y2FjMjU1NmZiZWMzMA==
   data.tar.gz: !binary |-
-    NzlhNmIxMGFjZTcwZDAzNDI4MjJkOWJiMTdhZGUyNjZiYTI0ZDgxYw==
+    MzI0ZTllMWNjZjcwYjJhZmNkNDVhYThiN2Y4Nzg4NzViYjU0YjIxOQ==
 SHA512:
   metadata.gz: !binary |-
-    NDJiNjc4MjAzMjEyMjgzMGI3MjBiZDFlOWZmNGQzM2UwNzcyOGVkMWUxOTQ2
-    ZmY3MzUzNTVmYjIzNDVlM2ZmODM5MmMyMjg4NzdhZTY2ZWMzN2IzOTMzNDcw
-    MWZlOWI3ZjBhNTc5ODVjYWQ3MDRkN2Q5ZjQxYTQ4YWM1ZmFhMTg=
+    MWFkODA3MDJjOTNlOTE0NjgyMTFkYjc3YTVlZmM5YWI5YTg0Yjc0NDVjNGY1
+    ZDQ3MDFkMTFiNWNhYzk5NWJjZWU3Nzk5Y2RhMTM0YTBiYzA0YjNlNWE5Yjhh
+    NDc1YjFkNWQyNzJmODhjYzVlMjZkNTMyZGEwMzU4MmY4ZjllM2E=
   data.tar.gz: !binary |-
-    YTk1ZTI3MTRjOTViM2ZjNWUyZGI1Y2UwMDEwYjRhMTJhMGE0NWUxM2ZjN2Nh
-    Y2Y4ZTE1MTcwNDA5MzEwNTA2MzgwZmNiMTZjOTNlMzhlMTJiMDgzMTY2MmU3
-    NDU5NWFhMWU2YWZjYmY3N2NhNGIyYjAzZDIwMTNhZjFjMjEwODQ=
+    ZDhlZjdkYWRiYzcyNzFiZDlkZDA1MzQxOWVkMjIwNDhlMDE5YjVmMDNjNDU0
+    YjU3YzNiNDU0MTgzN2MxMmZkZmQyNmVkYzY4ZTE4ZDY2NDkyZjhhNDNlZDMy
+    MzA2YzFlOGJhNTFlNGIwYzgyMzMyMWZjY2UxYWVkMWRjNDQxOWY=

data/Gemfile

@@ -7,6 +7,6 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
-  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.3.5'
 end
 

data/lib/vagrant-rekey-ssh/actions/secure_box.rb

@@ -1,5 +1,6 @@
 
 require "vagrant-rekey-ssh/helpers"
+require "fileutils"
 
 module VagrantPlugins
   module RekeySSH
@@ -37,6 +38,9 @@ module VagrantPlugins
           elsif result == 2
             raise Errors::ErrorReplacingInsecureKey
           elsif result == 3
+            # store an indicator that the key has been replaced
+            FileUtils.touch(rekey_sentinel_file)
+            
             @machine.ui.info(I18n.t("vagrant_rekey_ssh.info.key_replaced"))
             
             # if the insecure key *was* there, disable the user's and root's password too
@@ -45,6 +49,8 @@ module VagrantPlugins
             #    wasn't then perhaps it's a custom box and we shouldn't mess with it
             @machine.communicate.execute("sudo passwd --delete $USER; sudo passwd --delete root", sudo: false)  
             
+            
+            
           end
           
         end

data/lib/vagrant-rekey-ssh/actions/ssh_info.rb

@@ -24,8 +24,18 @@ module VagrantPlugins
           # in case we haven't replaced the key yet.
           # -> TODO: only specify the insecure key when we haven't set the
           #    less insecure key on the box.
+          
           if @machine.config.ssh.private_key_path.nil?
-            @machine.config.ssh.private_key_path = [ssh_key_path, @machine.env.default_private_key_path]
+            
+            if ::File.exists?(rekey_sentinel_file)
+              @machine.config.ssh.private_key_path = ssh_key_path
+            end
+            
+            # Vagrant < 1.4 only supports a single ssh key, do this differently
+            #if Vagrant::VERSION <= "1.4.0"
+            #else
+            #  @machine.config.ssh.private_key_path = [ssh_key_path, @machine.env.default_private_key_path]
+            #end
           end
           
         end

data/lib/vagrant-rekey-ssh/helpers.rb

@@ -19,6 +19,10 @@ module VagrantPlugins
         end
       end
       
+      def rekey_sentinel_file
+        ::File.join(@machine.data_dir, "rekey_sentinel")
+      end
+      
       def ssh_public_key
         IO.read(ssh_pubkey_path).scan( /^(\S+\s+\S+).*$/ ).last.first
       end

data/lib/vagrant-rekey-ssh/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module RekeySSH
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rekey-ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dustin Spicuzza