Foodcritic fixes

nickola · Feb 20, 2015 · 6b2ceaa · 6b2ceaa
1 parent bef87d0
commit 6b2ceaa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/metadata.rb b/metadata.rb
@@ -2,9 +2,9 @@
 maintainer        "Nickolay Kovalev"
 maintainer_email  "nickola@nickola.ru"
 license           "Apache 2.0"
-description       "Creates \"authorized_keys\" in user \"~/.ssh\" directory from a data bag"
+description       "Creates \"authorized_keys\" in user \"~/.ssh\" directory from a data bag (encrypted data bag supported)"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "1.2.6"
+version           "1.2.7"
 
 %w{ubuntu debian redhat centos fedora freebsd}.each do |os|
   supports os

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -34,8 +34,12 @@
 
       if not bag_users.kind_of?(String) and not bag_users.kind_of?(Array) and bag_users['groups'] != nil
         Array(bag_users['groups']).each do |group_name|
-          search(:users, 'groups:' + group_name) do |user|
-            ssh_keys += Array(user['ssh_keys'])
+          if not Chef::Config[:solo]
+            search(:users, 'groups:' + group_name) do |search_user|
+              ssh_keys += Array(search_user['ssh_keys'])
+            end
+          else
+            Chef::Log.warn("This recipe uses search for users detection by groups. Chef Solo does not support search.")
           end
         end
       end