chef 10.30.4 → 10.32.0.rc.0

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

@@ -1,88 +0,0 @@
-.\" generated with Ronn/v0.7.3
-.\" http://github.com/rtomayko/ronn/tree/0.7.3
-.
-.TH "KNIFE\-CONFIGURE" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
-.
-.SH "NAME"
-\fBknife\-configure\fR \- Generate configuration files for knife or Chef Client
-.
-.SH "SYNOPSIS"
-\fBknife\fR \fBconfigure\fR [client] \fI(options)\fR
-.
-.SH "DESCRIPTION"
-Generates a knife\.rb configuration file interactively\. When given the \-\-initial option, also creates a new administrative user\.
-.
-.SH "CONFIGURE SUBCOMMANDS"
-\fBknife configure\fR \fI(options)\fR
-.
-.TP
-\fB\-i\fR, \fB\-\-initial\fR
-Create an initial API Client
-.
-.TP
-\fB\-r\fR, \fB\-\-repository REPO\fR
-The path to your chef\-repo
-.
-.P
-Create a configuration file for knife\. This will prompt for values to enter into the file\. Default values are listed in square brackets if no other entry is typed\. See \fBknife\fR(1) for a description of configuration options\.
-.
-.P
-\fBknife configure client\fR \fIdirectory\fR
-.
-.P
-Read the \fIknife\.rb\fR config file and generate a config file suitable for use in \fI/etc/chef/client\.rb\fR and copy the validation certificate into the specified \fIdirectory\fR\.
-.
-.SH "EXAMPLES"
-.
-.IP "\(bu" 4
-On a freshly installed Chef Server, use \fIknife configure \-i\fR to create an administrator and knife configuration file\. Leave the field blank to accept the default value\. On most systems, the default values are acceptable\.
-.
-.IP
-user@host$ knife configure \-i
-.
-.br
-Please enter the chef server URL: [http://localhost:4000]
-.
-.br
-Please enter a clientname for the new client: [username]
-.
-.br
-Please enter the existing admin clientname: [chef\-webui]
-.
-.br
-Please enter the location of the existing admin client\'s private key: [/etc/chef/webui\.pem]
-.
-.br
-Please enter the validation clientname: [chef\-validator]
-.
-.br
-Please enter the location of the validation key: [/etc/chef/validation\.pem]
-.
-.br
-Please enter the path to a chef repository (or leave blank):
-.
-.br
-Creating initial API user\.\.\.
-.
-.br
-Created (or updated) client[username]
-.
-.br
-Configuration file written to /home/username/\.chef/knife\.rb
-.
-.IP
-This creates a new administrator client named \fIusername\fR, writes a configuration file to \fI/home/username/\.chef/knife\.rb\fR, and the private key to \fI/home/username/\.chef/username\.pem\fR\. The configuration file and private key may be copied to another system to facilitate administration of the Chef Server from a remote system\. Depending on the value given for the Chef Server URL, you may need to modify that setting after copying to a remote host\.
-.
-.IP "" 0
-.
-.SH "SEE ALSO"
-\fBknife\fR(1) \fBknife\-client\fR(1)
-.
-.SH "AUTHOR"
-Chef was written by Adam Jacob \fIadam@opscode\.com\fR with many contributions from the community\.
-.
-.SH "DOCUMENTATION"
-This manual page was written by Joshua Timberman \fIjoshua@opscode\.com\fR\. Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2\.0 License\.
-.
-.SH "CHEF"
-Knife is distributed with Chef\. \fIhttp://wiki\.opscode\.com/display/chef/Home\fR

data/distro/common/man/man1/knife-cookbook-site.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK\-SITE" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-COOKBOOK\-SITE" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\-site\fR \- Install and update open source cookbooks

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-COOKBOOK" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-COOKBOOK" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-cookbook\fR \- upload and manage chef cookbooks

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-DATA\-BAG" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-DATA\-BAG" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-data\-bag\fR \- Store arbitrary data on a Chef Server

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ENVIRONMENT" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-ENVIRONMENT" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-environment\fR \- Define cookbook policies for the environments in your infrastructure

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-EXEC" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-EXEC" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-exec\fR \- Run user scripts using the Chef API DSL

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-INDEX" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-index\fR \- Rebuild the search index on a Chef Server

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-NODE" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-node\fR \- Manage the hosts in your infrastructure

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-ROLE" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-role\fR \- Group common configuration settings

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SEARCH" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-search\fR \- Find objects on a Chef Server by query

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

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "KNIFE\-SSH" "1" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\-ssh\fR \- Run a command or interactive session on multiple remote hosts

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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "KNIFE" "1" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "SHEF" "1" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "March 2014" "Chef 10.32.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" "February 2014" "Chef 10.30.4" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "March 2014" "Chef 10.32.0.rc.0" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/lib/chef/api_client.rb

@@ -239,6 +239,9 @@ class Chef
 
     # Save this client via the REST API, returns a hash including the private key
     def save(new_key=false, validation=false)
+      # Implement CHEF-4373 with minimal churn to existing code:
+      return register_with_self_generated_key if new_key && validation && Chef::Config.local_key_generation
+
       if validation
         r = Chef::REST.new(Chef::Config[:chef_server_url], Chef::Config[:validation_client_name], Chef::Config[:validation_key])
       else
@@ -257,6 +260,25 @@ class Chef
       end
     end
 
+    def register_with_self_generated_key
+      r = Chef::REST.new(Chef::Config[:chef_server_url], Chef::Config[:validation_client_name], Chef::Config[:validation_key])
+      pkey = OpenSSL::PKey::RSA.generate(2048)
+      client_data = {:name => name, :admin => false , :public_key => pkey.public_key.to_pem}
+      # First, try and create a new registration
+      r = begin
+        r.post_rest("clients", client_data)
+      rescue Net::HTTPServerException => e
+        # If that fails, go ahead and try and update it
+        if e.response.code == "409"
+          r.put_rest("clients/#{name}", client_data)
+        else
+          raise e
+        end
+      end
+      private_key(pkey.to_pem)
+      self
+    end
+
     def reregister
       r = Chef::REST.new(Chef::Config[:chef_server_url])
       reregistered_self = r.put_rest("clients/#{name}", { :name => name, :admin => admin, :private_key => true })

data/lib/chef/checksum_cache.rb

@@ -149,7 +149,7 @@ class Chef
 
     def fetch(key)
       @moneta.fetch(key)
-    rescue ArgumentError => e
+    rescue ArgumentError, TypeError => e
       Log.warn "Error loading cached checksum for key #{key.inspect}"
       Log.warn(e)
       repair_checksum_cache

data/lib/chef/provider/service/macosx.rb

@@ -17,6 +17,7 @@
 #
 
 require 'chef/provider/service'
+require 'rexml/document'
 
 class Chef
   class Provider
@@ -35,6 +36,7 @@ class Chef
           @current_resource.service_name(@new_resource.service_name)
           @plist_size = 0
           @plist = find_service_plist
+          @service_label = find_service_label
           set_service_status
 
           @current_resource
@@ -42,14 +44,6 @@ class Chef
 
         def define_resource_requirements
           #super
-          requirements.assert(:enable) do |a| 
-            a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :enable"
-          end
-
-          requirements.assert(:disable) do |a| 
-            a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :disable"
-          end
-
           requirements.assert(:reload) do |a| 
             a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :reload"
           end
@@ -59,16 +53,21 @@ class Chef
             a.failure_message Chef::Exceptions::Service, "Several plist files match service name. Please use full service name."
           end
 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !@service_label.to_s.empty? }
+            a.failure_message Chef::Exceptions::Service,
+              "Could not find service's label in plist file '#{@plist}'!"
+          end
+
           requirements.assert(:all_actions) do |a| 
             a.assertion { @plist_size > 0 } 
-            # No failrue here in original code - so we also will not
+            # No failure here in original code - so we also will not
             # fail. Instead warn that the service is potentially missing
             a.whyrun "Assuming that the service would have been previously installed and is currently disabled." do 
               @current_resource.enabled(false)
               @current_resource.running(false)
             end
           end
-
         end
 
         def start_service
@@ -105,19 +104,56 @@ class Chef
           end
         end
 
+        # On OS/X, enabling a service has the side-effect of starting it,
+        # and disabling a service has the side-effect of stopping it.
+        #
+        # This makes some sense on OS/X since launchctl is an "init"-style
+        # supervisor that will restart daemons that are crashing, etc.
+        def enable_service
+          if @current_resource.enabled
+            Chef::Log.debug("#{@new_resource} already enabled, not enabling")
+          else
+            shell_out!(
+              "launchctl load -w '#{@plist}'",
+              :user => @owner_uid, :group => @owner_gid
+            )
+          end
+        end
+
+        def disable_service
+          unless @current_resource.enabled
+            Chef::Log.debug("#{@new_resource} not enabled, not disabling")
+          else
+            shell_out!(
+              "launchctl unload -w '#{@plist}'",
+              :user => @owner_uid, :group => @owner_gid
+            )
+          end
+        end
 
         def set_service_status
-          return if @plist == nil
+          return if @plist == nil or @service_label.to_s.empty?
 
-          @current_resource.enabled(!@plist.nil?)
+          cmd = shell_out(
+            "launchctl list #{@service_label}",
+            :user => @owner_uid, :group => @owner_gid
+          )
+
+          if cmd.exitstatus == 0
+            @current_resource.enabled(true)
+          else
+            @current_resource.enabled(false)
+          end
 
           if @current_resource.enabled
             @owner_uid = ::File.stat(@plist).uid
             @owner_gid = ::File.stat(@plist).gid
 
-            shell_out!("launchctl list", :user => @owner_uid, :group => @owner_gid).stdout.each_line do |line|
+            shell_out!(
+              "launchctl list", :user => @owner_uid, :group => @owner_gid
+            ).stdout.each_line do |line|
               case line
-              when /(\d+|-)\s+(?:\d+|-)\s+(.*\.?)#{@current_resource.service_name}/
+              when /(\d+|-)\s+(?:\d+|-)\s+(.*\.?)#{@service_label}/
                 pid = $1
                 @current_resource.running(!pid.to_i.zero?)
               end
@@ -129,9 +165,27 @@ class Chef
 
       private
 
+        def find_service_label
+          # Most services have the same internal label as the name of the
+          # plist file. However, there is no rule saying that *has* to be
+          # the case, and some core services (notably, ssh) do not follow
+          # this rule.
+
+          # plist files can come in XML or Binary formats. this command
+          # will make sure we get XML every time.
+          plist_xml = shell_out!("plutil -convert xml1 -o - #{@plist}").stdout
+
+          plist_doc = REXML::Document.new(plist_xml)
+          plist_doc.elements[
+            "/plist/dict/key[text()='Label']/following::string[1]/text()"]
+        end
+
         def find_service_plist
           plists = PLIST_DIRS.inject([]) do |results, dir|
-            entries = Dir.glob("#{::File.expand_path(dir)}/*#{@current_resource.service_name}*.plist")
+            edir = ::File.expand_path(dir)
+            entries = Dir.glob(
+              "#{edir}/*#{@current_resource.service_name}*.plist"
+            )
             entries.any? ? results << entries : results
           end
           plists.flatten!