chef 10.14.4 → 10.16.0.rc.0

data/distro/common/man/man1/knife-status.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-STATUS" "1" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-status\fR \- Display status information for the nodes in your infrastructure

data/distro/common/man/man1/knife-tag.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-TAG" "1" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-tag\fR \- Apply tags to nodes on a Chef Server

data/distro/common/man/man1/knife.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE" "1" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "KNIFE" "1" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility

data/distro/common/man/man1/shef.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "SHEF" "1" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "SHEF" "1" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBshef\fR \- Interactive Chef Console

data/distro/common/man/man8/chef-client.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-CLIENT" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-client\fR \- Runs a client node connecting to a chef\-server\.

data/distro/common/man/man8/chef-expander.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDER" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expander\fR \- fetches messages from RabbitMQ, processes, and loads into chef\-solr

data/distro/common/man/man8/chef-expanderctl.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-EXPANDERCTL" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-expanderctl\fR \- management program for chef\-expander

data/distro/common/man/man8/chef-server-webui.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER\-WEBUI" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\-webui\fR \- Start the Chef Server merb application slice providing Web User Interface (Management Console)\.

data/distro/common/man/man8/chef-server.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SERVER" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-server\fR \- Start the Chef Server merb application slice\.

data/distro/common/man/man8/chef-solo.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLO" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.

data/distro/common/man/man8/chef-solr.8

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "CHEF\-SOLR" "8" "September 2012" "Chef 10.14.4" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "October 2012" "Chef 10.16.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/distro/debian/etc/init.d/chef-client

@@ -15,7 +15,7 @@
 # description: starts up chef-client in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-client
+DAEMON=$(which chef-client)
 NAME=chef-client
 DESC=chef-client
 PIDFILE=/var/run/chef/client.pid

data/distro/debian/etc/init.d/chef-expander

@@ -15,7 +15,7 @@
 # description: starts up chef-expander in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-expander
+DAEMON=$(which chef-expander)
 NAME=chef-expander
 DESC=chef-expander
 PIDFILE=/var/run/chef/expander.pid

data/distro/debian/etc/init.d/chef-server

@@ -15,7 +15,7 @@
 # description: starts up chef-server webui.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-server
+DAEMON=$(which chef-server)
 PIDFILE=/var/run/chef/server.%s.pid
 MAINPID=/var/run/chef/server.main.pid
 NAME=chef-server

data/distro/debian/etc/init.d/chef-server-webui

@@ -15,7 +15,7 @@
 # description: starts up chef-server webui.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-server-webui
+DAEMON=$(which chef-server-webui)
 PIDFILE=/var/run/chef/server-webui.%s.pid
 MAINPID=/var/run/chef/server-webui.main.pid
 NAME=chef-server-webui

data/distro/debian/etc/init.d/chef-solr

@@ -15,7 +15,7 @@
 # description: starts up chef-solr in daemon mode.
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/chef-solr
+DAEMON=$(which chef-solr)
 DAEMON_NAME=java
 NAME=chef-solr
 DESC=chef-solr

data/lib/chef/application/client.rb

@@ -176,10 +176,10 @@ class Chef::Application::Client < Chef::Application
     :description  => "Fork client",
     :boolean      => true
 
-  option :disable_reporting,
+  option :enable_reporting,
     :short        => "-R",
-    :long         => "--disable-reporting",
-    :description  => "Disable reporting data collection for chef runs",
+    :long         => "--enable-reporting",
+    :description  => "Enable reporting data collection for chef runs",
     :boolean      => true
 
   attr_reader :chef_client_json

data/lib/chef/client.rb

@@ -447,7 +447,10 @@ class Chef
 
     # Ensures runlist override contains RunListItem instances
     def runlist_override_sanity_check!
-      @override_runlist = @override_runlist.split(',') if @override_runlist.is_a?(String)
+      # Convert to array and remove whitespace
+      if @override_runlist.is_a?(String)
+        @override_runlist = @override_runlist.split(',').map { |e| e.strip }
+      end
       @override_runlist = [@override_runlist].flatten.compact
       @override_runlist.map! do |item|
         if(item.is_a?(Chef::RunList::RunListItem))

data/lib/chef/config.rb

@@ -201,7 +201,8 @@ class Chef
     why_run false
     color false
     client_fork false
-    disable_reporting true
+    enable_reporting true
+    enable_reporting_url_fatals false
     
     # Set these to enable SSL authentication / mutual-authentication
     # with the server

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -17,6 +17,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -26,6 +27,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -30,6 +30,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -39,6 +40,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/chef-full.erb

@@ -32,7 +32,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
-
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -42,6 +42,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -17,6 +17,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -26,6 +27,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -17,6 +17,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -26,6 +27,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -24,6 +24,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -33,6 +34,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb

@@ -19,6 +19,7 @@ EOP
 ) > /tmp/validation.pem
 awk NF /tmp/validation.pem > /etc/chef/validation.pem
 rm /tmp/validation.pem
+chmod 0600 /etc/chef/validation.pem
 
 <% if @chef_config[:encrypted_data_bag_secret] -%>
 (
@@ -28,6 +29,7 @@ EOP
 ) > /tmp/encrypted_data_bag_secret
 awk NF /tmp/encrypted_data_bag_secret > /etc/chef/encrypted_data_bag_secret
 rm /tmp/encrypted_data_bag_secret
+chmod 0600 /etc/chef/encrypted_data_bag_secret
 <% end -%>
 
 <%# Generate Ohai Hints -%>

data/lib/chef/knife/configure.rb

@@ -42,6 +42,22 @@ class Chef
         :boolean => true,
         :description => "Create an initial API Client"
 
+      option :admin_client_name,
+        :long => "--admin-client-name NAME",
+        :description => "The existing admin clientname (usually chef-webui)"
+
+      option :admin_client_key,
+        :long => "--admin-client-key PATH",
+        :description => "The path to the admin client's private key (usually a file named webui.pem)"
+
+      option :validation_client_name,
+        :long => "--validation-client-name NAME",
+        :description => "The validation clientname (usually chef-validator)"
+
+      option :validation_key,
+        :long => "--validation-key PATH",
+        :description => "The location of the location of the validation key (usually a file named validation.pem)"
+
       def configure_chef
         # We are just faking out the system so that you can do this without a key specified
         Chef::Config[:node_name] = 'woot'
@@ -120,14 +136,17 @@ EOH
           @new_client_name        = config[:node_name] || ask_question("Please enter a clientname for the new client: ", :default => Etc.getlogin)
           @admin_client_name      = config[:admin_client_name] || ask_question("Please enter the existing admin clientname: ", :default => 'chef-webui')
           @admin_client_key       = config[:admin_client_key] || ask_question("Please enter the location of the existing admin client's private key: ", :default => '/etc/chef/webui.pem')
+          @admin_client_key       = File.expand_path(@admin_client_key)
         else
           @new_client_name        = config[:node_name] || ask_question("Please enter an existing username or clientname for the API: ", :default => Etc.getlogin)
         end
         @validation_client_name = config[:validation_client_name] || ask_question("Please enter the validation clientname: ", :default => 'chef-validator')
         @validation_key         = config[:validation_key] || ask_question("Please enter the location of the validation key: ", :default => '/etc/chef/validation.pem')
+        @validation_key         = File.expand_path(@validation_key)
         @chef_repo              = config[:repository] || ask_question("Please enter the path to a chef repository (or leave blank): ")
 
         @new_client_key = config[:client_key] || File.join(chef_config_path, "#{@new_client_name}.pem")
+        @new_client_key = File.expand_path(@new_client_key)
       end
 
       def guess_servername

data/lib/chef/knife/data_bag_from_file.rb

@@ -46,7 +46,7 @@ class Chef
       option :all,
       :short => "-a",
       :long  => "--all",
-      :description => "Upload all data bags"
+      :description => "Upload all data bags or all items for specified data bags"
 
       def read_secret
         if config[:secret]

data/lib/chef/knife/environment_from_file.rb

@@ -25,26 +25,59 @@ class Chef
         require 'chef/knife/core/object_loader'
       end
 
-      banner "knife environment from file FILE (options)"
+      banner "knife environment from file FILE [FILE..] (options)"
+
+      option :all,
+      :short => "-a",
+      :long  => "--all",
+      :description => "Upload all environments"
 
       def loader
         @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
       end
 
+      def environments_path
+        @environments_path ||= "environments"
+      end
 
-      def run
-        if @name_args[0].nil?
-          show_usage
-          ui.fatal("You must specify a file to load")
-          exit 1
-        end
+      def find_all_environments
+        loader.find_all_objects("./#{environments_path}/")
+      end
 
+      def load_all_environments
+        environments = find_all_environments
+        if environments.empty?
+          ui.fatal("Unable to find any environment files in '#{environments_path}'")
+          exit(1)
+        end
+        environments.each do |env|
+          load_environment(env)
+        end
+      end
 
-        updated = loader.load_from("environments", @name_args[0])
+      def load_environment(env)
+        updated = loader.load_from("environments", env)
         updated.save
         output(format_for_display(updated)) if config[:print_after]
         ui.info("Updated Environment #{updated.name}")
       end
+
+        
+      def run
+        if config[:all] == true
+          load_all_environments
+        else
+          if @name_args[0].nil?
+            show_usage
+            ui.fatal("You must specify a file to load")
+            exit 1
+          end
+  
+          @name_args.each do |arg|
+            load_environment(arg)
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/knife/ssh.rb

@@ -124,6 +124,8 @@ class Chef
                  q = Chef::Search::Query.new
                  @action_nodes = q.search(:node, @name_args[0])[0]
                  @action_nodes.each do |item|
+                   # we should skip the loop to next iteration if the item returned by the search is nil
+                   next if item.nil? 
                    # if a command line attribute was not passed, and we have a cloud public_hostname, use that.
                    # see #configure_attribute for the source of config[:attribute] and config[:override_attribute]
                    if !config[:override_attribute] && item[:cloud] and item[:cloud][:public_hostname]
@@ -133,7 +135,9 @@ class Chef
                    else
                      i = format_for_display(item)[config[:attribute]]
                    end
-                   r.push(i) unless i.nil?
+                   # next if we couldn't find the specified attribute in the returned node object
+                   next if i.nil?
+                   r.push(i)
                  end
                  r
                end