choria-mcorpc-support 2.21.1 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7838c880fe400df6a4ba9cc315b99f8e53cf5ed
-  data.tar.gz: eb1af548ab4d9f79abf4accb138d6aa6becbe620
+  metadata.gz: d5151bca988c13512d1ee9cb12fb125b05fa0d23
+  data.tar.gz: cb3874403af146e42bb62dfbc757214793304ff0
 SHA512:
-  metadata.gz: 8e1a3b75838b504abc5e16cd6a4e653ccc70eba34a5c2fb40ac39ff4d764f5960a4535b5e6eace6ab28fc75d839c7b57f9c67613d3886f3d37364ae873878df4
-  data.tar.gz: b0dadeac2193e6a043a00e6bc90592485db8bfdf35563787e024457b248c391b7fe5628510af7cb7d3a0ddf455359cf148968c43db0d3cd80b304ea3f97fd9b6
+  metadata.gz: bfa78420e316f4b13d985e51564716877c9e85a3b0b7eaabd79c7c29758f7c4d155ad203c5698bcce744c5a9c9ed1ab49a573970c60840468ca08887c98e22bb
+  data.tar.gz: 61a065d3f880a3943ee0ea389730aabc8c4da5b790c26c8014df4b4861579448050c75c2119195e0d53cda089846b65405f6e3ab497a2215d5d7ef14a4ef9a2c

data/lib/mcollective.rb

@@ -54,7 +54,7 @@ module MCollective
   require "mcollective/util"
   require "mcollective/validator"
 
-  VERSION = "2.21.1".freeze
+  VERSION = "2.22.0".freeze
 
   def self.version
     VERSION

data/lib/mcollective/util.rb

@@ -169,6 +169,7 @@ module MCollective
       else
         config_paths << "/etc/puppetlabs/mcollective/client.cfg"
         config_paths << "/etc/mcollective/client.cfg"
+        config_paths << "/usr/local/etc/mcollective/client.cfg"
       end
 
       config_paths
@@ -188,22 +189,25 @@ module MCollective
         config_paths << File.join(choria_windows_prefix, "etc", "client.conf")
       else
         config_paths << "/etc/choria/client.conf"
+        config_paths << "/usr/local/etc/choria/client.conf"
       end
 
       config_paths
     end
 
-    # Picks the default user config file, pririties are first Choria ones then old MCollective ones
+    # Picks the default user config file, priorities are first Choria ones then old MCollective ones
     #
     # In roughly this order, first to exist is used:
     #
     # - ~/.choriarc
     # - APPData/ChoriaIO/choria/etc/client.conf on windows
-    # - /etc/choria/client.conf on unix
+    # - /etc/choria/client.conf then
+    # - /usr/local/etc/choria/client.conf on unix
     # - ~/.mcollective
     # - APPData/PuppetLabs/mcollective/etc/client.cfg on windows
     # - /etc/puppetlabs/mcollective/client.cfg
     # - /etc/mcollective/client.cfg
+    # - /usr/local/etc/mcollective/client.cfg
     def self.config_file_for_user
       config_paths = choria_config_paths_for_user + mcollective_config_paths_for_user
       found = config_paths.find_index { |file| File.readable?(file) } || 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.21.1
+  version: 2.22.0
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu