choria-mcorpc-support 2.21.1 → 2.22.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/mcollective.rb +1 -1
- data/lib/mcollective/util.rb +6 -2
- 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: d5151bca988c13512d1ee9cb12fb125b05fa0d23
|
4
|
+
data.tar.gz: cb3874403af146e42bb62dfbc757214793304ff0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bfa78420e316f4b13d985e51564716877c9e85a3b0b7eaabd79c7c29758f7c4d155ad203c5698bcce744c5a9c9ed1ab49a573970c60840468ca08887c98e22bb
|
7
|
+
data.tar.gz: 61a065d3f880a3943ee0ea389730aabc8c4da5b790c26c8014df4b4861579448050c75c2119195e0d53cda089846b65405f6e3ab497a2215d5d7ef14a4ef9a2c
|
data/lib/mcollective.rb
CHANGED
data/lib/mcollective/util.rb
CHANGED
@@ -169,6 +169,7 @@ module MCollective
|
|
169
169
|
else
|
170
170
|
config_paths << "/etc/puppetlabs/mcollective/client.cfg"
|
171
171
|
config_paths << "/etc/mcollective/client.cfg"
|
172
|
+
config_paths << "/usr/local/etc/mcollective/client.cfg"
|
172
173
|
end
|
173
174
|
|
174
175
|
config_paths
|
@@ -188,22 +189,25 @@ module MCollective
|
|
188
189
|
config_paths << File.join(choria_windows_prefix, "etc", "client.conf")
|
189
190
|
else
|
190
191
|
config_paths << "/etc/choria/client.conf"
|
192
|
+
config_paths << "/usr/local/etc/choria/client.conf"
|
191
193
|
end
|
192
194
|
|
193
195
|
config_paths
|
194
196
|
end
|
195
197
|
|
196
|
-
# Picks the default user config file,
|
198
|
+
# Picks the default user config file, priorities are first Choria ones then old MCollective ones
|
197
199
|
#
|
198
200
|
# In roughly this order, first to exist is used:
|
199
201
|
#
|
200
202
|
# - ~/.choriarc
|
201
203
|
# - APPData/ChoriaIO/choria/etc/client.conf on windows
|
202
|
-
# - /etc/choria/client.conf
|
204
|
+
# - /etc/choria/client.conf then
|
205
|
+
# - /usr/local/etc/choria/client.conf on unix
|
203
206
|
# - ~/.mcollective
|
204
207
|
# - APPData/PuppetLabs/mcollective/etc/client.cfg on windows
|
205
208
|
# - /etc/puppetlabs/mcollective/client.cfg
|
206
209
|
# - /etc/mcollective/client.cfg
|
210
|
+
# - /usr/local/etc/mcollective/client.cfg
|
207
211
|
def self.config_file_for_user
|
208
212
|
config_paths = choria_config_paths_for_user + mcollective_config_paths_for_user
|
209
213
|
found = config_paths.find_index { |file| File.readable?(file) } || 0
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: choria-mcorpc-support
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.22.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- R.I.Pienaar
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: systemu
|