knife-solo 0.7.0.pre2 → 0.7.0.pre3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/knife-solo/bootstraps/linux.rb +1 -1
- data/lib/knife-solo/info.rb +1 -1
- data/lib/knife-solo/ssh_command.rb +3 -3
- data/test/ssh_command_test.rb +4 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: db388a0dfc90e44b4fc5c5788c1cadaafa6aca74
|
4
|
+
data.tar.gz: 6ea3b0ebcb930c60e459f66e00dbc8872ca0162a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1b7effacdf6c722cd879268334e8a42fb6e9a0026caaca2ea155b879590c9cfd33e7d17eb8c573d09912eb0c8a1a9b2c500c3ac7a79de672654e635d990bf4aa
|
7
|
+
data.tar.gz: e8500a551c30e4772d29a669ac191b4cdcc6fe0fb128e5b7b595ac29a8869fd112449f3ad99dc9463f7a5af31a54c7b8c786d869b55fe96790d1db0df31270a3
|
@@ -70,7 +70,7 @@ module KnifeSolo::Bootstraps
|
|
70
70
|
def distro
|
71
71
|
return @distro if @distro
|
72
72
|
@distro = case issue
|
73
|
-
when %r{Debian GNU/Linux [
|
73
|
+
when %r{Debian GNU/Linux [6789]}
|
74
74
|
{:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
|
75
75
|
when %r{Debian}
|
76
76
|
{:type => "debianoid_gem"}
|
data/lib/knife-solo/info.rb
CHANGED
@@ -206,11 +206,11 @@ module KnifeSolo
|
|
206
206
|
|
207
207
|
args << [user, host].compact.join('@')
|
208
208
|
|
209
|
-
args << "-F #{config[:ssh_config]}" if config[:ssh_config]
|
210
|
-
args << "-i #{identity_file}" if identity_file
|
209
|
+
args << "-F \"#{config[:ssh_config]}\"" if config[:ssh_config]
|
210
|
+
args << "-i \"#{identity_file}\"" if identity_file
|
211
211
|
args << "-o ForwardAgent=yes" if config[:forward_agent]
|
212
212
|
args << "-p #{config[:ssh_port]}" if config[:ssh_port]
|
213
|
-
args << "-o UserKnownHostsFile
|
213
|
+
args << "-o UserKnownHostsFile=\"#{connection_options[:user_known_hosts_file]}\"" if config[:host_key_verify] == false
|
214
214
|
args << "-o StrictHostKeyChecking=no" if config[:host_key_verify] == false
|
215
215
|
args << "-o ControlMaster=auto -o ControlPath=#{ssh_control_path} -o ControlPersist=3600" unless config[:ssh_control_master] == "no"
|
216
216
|
|
data/test/ssh_command_test.rb
CHANGED
@@ -134,15 +134,15 @@ class SshCommandTest < TestCase
|
|
134
134
|
|
135
135
|
cmd = command("usertest@10.0.0.1", "--ssh-config-file=myconfig")
|
136
136
|
cmd.validate_ssh_options!
|
137
|
-
assert_equal "usertest@10.0.0.1 -F myconfig", cmd.ssh_args
|
137
|
+
assert_equal "usertest@10.0.0.1 -F \"myconfig\"", cmd.ssh_args
|
138
138
|
|
139
139
|
cmd = command("usertest@10.0.0.1", "--ssh-identity=my_rsa")
|
140
140
|
cmd.validate_ssh_options!
|
141
|
-
assert_equal "usertest@10.0.0.1 -i my_rsa", cmd.ssh_args
|
141
|
+
assert_equal "usertest@10.0.0.1 -i \"my_rsa\"", cmd.ssh_args
|
142
142
|
|
143
143
|
cmd = command("usertest@10.0.0.1", "--identity-file=my_rsa")
|
144
144
|
cmd.validate_ssh_options!
|
145
|
-
assert_equal "usertest@10.0.0.1 -i my_rsa", cmd.ssh_args
|
145
|
+
assert_equal "usertest@10.0.0.1 -i \"my_rsa\"", cmd.ssh_args
|
146
146
|
|
147
147
|
cmd = command("usertest@10.0.0.1", "--ssh-port=222")
|
148
148
|
cmd.validate_ssh_options!
|
@@ -150,7 +150,7 @@ class SshCommandTest < TestCase
|
|
150
150
|
|
151
151
|
cmd = command("usertest@10.0.0.1", "--no-host-key-verify")
|
152
152
|
cmd.validate_ssh_options!
|
153
|
-
assert_equal "usertest@10.0.0.1 -o UserKnownHostsFile
|
153
|
+
assert_equal "usertest@10.0.0.1 -o UserKnownHostsFile=\"/dev/null\" -o StrictHostKeyChecking=no", cmd.ssh_args
|
154
154
|
|
155
155
|
cmd = command("usertest@10.0.0.1", "--forward-agent")
|
156
156
|
cmd.validate_ssh_options!
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-solo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.0.
|
4
|
+
version: 0.7.0.pre3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mat Schaffer
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-01-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: berkshelf
|