libvirtinator 0.1.1 → 0.1.2

data/lib/libvirtinator/examples/vmbuilder-init.sh.erb

@@ -2,4 +2,5 @@
 
 chroot $1 apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
 chroot $1 sh -c "echo deb https://apt.dockerproject.org/repo ubuntu-trusty main > /etc/apt/sources.list.d/docker.list"
-chroot $1 apt-get update -qq && apt-get install -y docker-engine
+chroot $1 apt-get update -qq
+chroot $1 apt-get install -y docker-engine

data/lib/libvirtinator/users.rb

@@ -1,21 +1,21 @@
 namespace :users do
 
   task :load_settings => 'libvirtinator:load_settings' do
-    if ENV['key_path'].nil?
-      set :path, ""
-      until File.exists?(fetch(:path)) and (! File.directory?(fetch(:path)))
-        ask :path, "Which private key has SSH access to the VM? Specifiy an absolute path"
+    if fetch(:private_key_path).nil?
+      SSHKit::Backend::Netssh.configure do |ssh|
+        ssh.ssh_options = {
+          forward_agent: false,
+          auth_methods: %w(publickey)
+        }
       end
     else
-      warn "Using #{ENV['key_path']} (passed as an environment variable.)"
-      set :path, ENV['key_path']
-    end
-    SSHKit::Backend::Netssh.configure do |ssh|
-      ssh.ssh_options = {
-        keys: fetch(:path),
-        forward_agent: false,
-        auth_methods: %w(publickey)
-      }
+      SSHKit::Backend::Netssh.configure do |ssh|
+        ssh.ssh_options = {
+          keys: fetch(:private_key_path),
+          forward_agent: false,
+          auth_methods: %w(publickey)
+        }
+      end
     end
   end
 
@@ -65,6 +65,11 @@ namespace :users do
             end
           end
         end
+      run_locally do
+        unless fetch(:private_key_path).nil?
+          execute "rm", "-f", "#{fetch(:private_key_path)}*"
+        end
+      end
       info "Finished setting up users"
       end
     end

data/lib/libvirtinator/vm.rb

@@ -241,11 +241,13 @@ task :update_root_image => 'libvirtinator:load_settings' do
         execute "chroot", mount_point, "/bin/bash", "-c",
           "\"chown", "#{user}:#{user}", "/home/#{user}", "/home/#{user}/.ssh\""
         execute "chmod", "700", "#{mount_point}/home/#{user}/.ssh"
-        set :path, ""
-        until File.exists? fetch(:path) and ! File.directory? fetch(:path)
-          ask :path, "Which public key should we install in #{user}'s authorized_keys file? Specifiy an absolute path"
+        key_name = "temp_key_#{fetch(:stage)}"
+        set :private_key_path, key_name
+        run_locally do
+          execute "rm", "-f", key_name
+          execute "ssh-keygen", "-P", "''", "-f", key_name
         end
-        upload! File.open(fetch(:path)), "/tmp/pubkeys"
+        upload! File.open("#{key_name}.pub"), "/tmp/pubkeys"
         execute "mv", "/tmp/pubkeys", "#{mount_point}/home/#{user}/.ssh/authorized_keys"
         execute "chroot", mount_point, "/bin/bash", "-c",
           "\"chown", "#{user}:#{user}", "/home/#{user}/.ssh/authorized_keys\""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libvirtinator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano