chef 11.4.4 → 11.6.0.hotfix.1

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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-INDEX" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-NODE" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-ROLE" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-SEARCH" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-SSH" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-STATUS" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE\-TAG" "1" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "KNIFE" "1" "August 2013" "Chef 11.6.0.hotfix.1" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility

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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "August 2013" "Chef 11.6.0.hotfix.1" "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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "August 2013" "Chef 11.6.0.hotfix.1" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solo\fR \- Runs chef in solo mode against a specified cookbook location\.
@@ -68,18 +68,7 @@ Chef Solo allows you to run Chef Cookbooks in the absence of a Chef Server\. To
 By default Chef Solo will look in /etc/chef/solo\.rb for its configuration\. This configuration file has two required variables: file_cache_path and cookbook_path\.
 .
 .P
-For example:
-.
-.IP "" 4
-.
-.nf
-
-file_cache_path "/var/chef\-solo"
-cookbook_path "/var/chef\-solo/cookbooks"
-.
-.fi
-.
-.IP "" 0
+For example: file_cache_path "/var/chef\-solo" cookbook_path "/var/chef\-solo/cookbooks"
 .
 .P
 For your own systems, you can change this to reflect any directory you like, but you\'ll need to specify absolute paths and the cookbook_path directory should be a subdirectory of the file_cache_path\.
@@ -88,18 +77,7 @@ For your own systems, you can change this to reflect any directory you like, but
 You can also specify cookbook_path as an array, passing multiple locations to search for cookbooks\.
 .
 .P
-For example:
-.
-.IP "" 4
-.
-.nf
-
-file_cache_path "/var/chef\-solo"
-cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
-.
-.fi
-.
-.IP "" 0
+For example: file_cache_path "/var/chef\-solo" cookbook_path ["/var/chef\-solo/cookbooks", "/var/chef\-solo/site\-cookbooks"]
 .
 .P
 Note that earlier entries are now overridden by later ones\.
@@ -133,17 +111,7 @@ Then you can run chef\-solo with \-j to specify the JSON file\. It will look for
 You can use \-c to specify the path to the configuration file (if you don\'t want chef\-solo to use the default)\. You can also specify \-r for a cookbook tarball\.
 .
 .P
-For example:
-.
-.IP "" 4
-.
-.nf
-
-chef\-solo \-c ~/solo\.rb \-j ~/node\.json  \-r http://www\.example\.com/chef\-solo\.tar\.gz
-.
-.fi
-.
-.IP "" 0
+For example: chef\-solo \-c ~/solo\.rb \-j ~/node\.json \-r http://www\.example\.com/chef\-solo\.tar\.gz
 .
 .P
 In the above case, chef\-solo would extract the tarball to your specified cookbook_path, use ~/solo\.rb as the configuration file, and apply attributes and use the run_list from ~/node\.json\.

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" "April 2013" "Chef 11.4.4" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "August 2013" "Chef 11.6.0.hotfix.1" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

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

@@ -165,8 +165,10 @@ case "$1" in
   restart|force-reload)
     log_daemon_msg "Restarting $DESC" "$NAME"
     errcode=0
-    stop_server || errcode=$?
-    [ -n "$DIETIME" ] && sleep $DIETIME
+    if running ; then
+      stop_server || errcode=$?
+      [ -n "$DIETIME" ] && sleep $DIETIME
+    fi
     start_server || errcode=$?
     [ -n "$STARTTIME" ] && sleep $STARTTIME
     running || errcode=$?

data/distro/windows/service_manager.rb

@@ -16,149 +16,5 @@
 # limitations under the License.
 #
 
-require 'win32/service'
-require 'rbconfig'
-require 'mixlib/cli'
-
-class Chef
-  class Windows
-    class ServiceManager
-      include Config
-      include Mixlib::CLI
-
-      option :action,
-        :short => "-a ACTION",
-        :long  => "--action ACTION",
-        :default => "start",
-        :description => "Action to carry out on the resource; one of 'install', 'uninstall', 'start', 'stop', 'pause', or 'resume'"
-
-      option :name,
-        :short => "-n NAME",
-        :long  => "--name NAME",
-        :default => "chef-client",
-        :description => "The service name to use."
-
-      option :display_name,
-        :long  => "--display_name NAME",
-        :default => "chef-client",
-        :description => "The display name to use for the service."
-
-      option :description,
-        :short => "-d DESCRIPTION",
-        :long  => "--description DESCRIPTION",
-        :default => "chef-client",
-        :description => "The description for the service."
-
-      option :config_file,
-        :short => "-c CONFIG",
-        :long  => "--config CONFIG",
-        :default => "#{ENV['SYSTEMDRIVE']}/chef/client.rb",
-        :description => "The configuration file to use"
-
-      option :log_location,
-        :short        => "-L LOGLOCATION",
-        :long         => "--logfile LOGLOCATION",
-        :description  => "Set the log file location",
-        :default => "#{ENV['SYSTEMDRIVE']}/chef/client.log"
-
-      option :splay,
-        :short        => "-s SECONDS",
-        :long         => "--splay SECONDS",
-        :description  => "The splay time for running at intervals, in seconds",
-        :proc         => lambda { |s| s.to_i }
-
-      option :interval,
-        :short        => "-i SECONDS",
-        :long         => "--interval SECONDS",
-        :description  => "Set the number of seconds to wait between chef-client runs",
-        :proc         => lambda { |s| s.to_i }
-
-      option :help,
-        :short        => "-h",
-        :long         => "--help",
-        :description  => "Show this message",
-        :on           => :tail,
-        :boolean      => true,
-        :show_options => true,
-        :exit         => 0
-
-      def run
-        parse_options
-
-        case config[:action]
-        when 'install'
-          ruby = File.join(RbConfig::CONFIG['bindir'], 'ruby')
-          path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib', 'chef', 'application', 'windows_service.rb'))
-
-          opts = ""
-          opts << " -c #{config[:config_file]}" if config[:config_file]
-          opts << " -L #{config[:log_location]}" if config[:log_location]
-          opts << " -i #{config[:interval]}" if config[:interval]
-          opts << " -s #{config[:splay]}" if config[:splay]
-
-          # Quote the full paths to deal with possible spaces in the path name.
-          # Also ensure all forward slashes are backslashes
-          cmd = "\"#{ruby}\" \"#{path}\" #{opts}".gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-
-          Win32::Service.new(
-                      :service_name     => config[:name],
-                      :display_name     => config[:display_name],
-                      :description      => config[:description],
-                      :binary_path_name => cmd)
-          puts "Service '#{config[:name]}' has successfully been 'installed'."
-        when 'start'
-          # TODO: allow override of startup parameters here?
-          take_action('start', RUNNING) if Win32::Service.exists?(config[:name])
-        when 'stop'
-          take_action('stop', STOPPED) if Win32::Service.exists?(config[:name])
-        when 'uninstall', 'delete'
-          take_action('stop', STOPPED)
-          if Win32::Service.exists?(config[:name])
-            Win32::Service.delete(config[:name])
-            puts "Service #{config[:name]} deleted"
-          end
-        when 'pause'
-          take_action('pause', PAUSED)
-        when 'resume'
-          take_action('resume', RUNNING)
-        end
-      end
-
-      private
-
-      # Just some state constants
-      STOPPED = "stopped"
-      RUNNING = "running"
-      PAUSED = "paused"
-
-      def take_action(action=nil, desired_state=nil)
-        if Win32::Service.exists?(config[:name])
-          if current_state != desired_state
-            Win32::Service.send(action, config[:name])
-            wait_for_state(desired_state)
-            puts "Service '#{config[:name]}' is now '#{current_state}'."
-          else
-            puts "Service '#{config[:name]}' is already '#{desired_state}'."
-          end
-        else
-          puts "Cannot '#{action}' service '#{config[:name]}', service does not exist."
-        end
-      end
-
-      def current_state
-        Win32::Service.status(config[:name]).current_state
-      end
-
-      # Helper method that waits for a status to change its state since state
-      # changes aren't usually instantaneous.
-      def wait_for_state(desired_state)
-        while current_state != desired_state
-          puts "One moment... #{current_state}"
-          sleep 1
-        end
-      end
-    end
-  end
-end
-
-Chef::Windows::ServiceManager.new.run
+$stderr.puts "WARNING: service_manager.rb is changed to: chef-service-manager"
+$stderr.puts "Please use chef-service-manager instead of service_manager.rb to install and manage chef-client as a windows service."

data/lib/chef.rb

@@ -33,7 +33,7 @@ require 'chef/handler'
 require 'chef/handler/json_file'
 
 require 'chef/monkey_patches/tempfile'
-require 'chef/monkey_patches/dir'
 require 'chef/monkey_patches/string'
 require 'chef/monkey_patches/numeric'
 require 'chef/monkey_patches/object'
+require 'chef/monkey_patches/file'

data/lib/chef/application.rb

@@ -29,18 +29,11 @@ require 'rbconfig'
 class Chef::Application
   include Mixlib::CLI
 
-  class Wakeup < Exception
-  end
-
   def initialize
     super
 
     @chef_client = nil
     @chef_client_json = nil
-    trap("TERM") do
-      Chef::Application.fatal!("SIGTERM received, stopping", 1)
-    end
-
     trap("INT") do
       Chef::Application.fatal!("SIGINT received, stopping", 2)
     end
@@ -91,11 +84,11 @@ class Chef::Application
 
       Chef::Config.merge!(config)
     rescue SocketError => error
-      Chef::Application.fatal!("Error getting config file #{Chef::Config[:config_file]}", 2)
+      Chef::Application.fatal!("Error getting config file #{config[:config_file]}", 2)
     rescue Chef::Exceptions::ConfigurationError => error
-      Chef::Application.fatal!("Error processing config file #{Chef::Config[:config_file]} with error #{error.message}", 2)
+      Chef::Application.fatal!("Error processing config file #{config[:config_file]} with error #{error.message}", 2)
     rescue Exception => error
-      Chef::Application.fatal!("Unknown error processing config file #{Chef::Config[:config_file]} with error #{error.message}", 2)
+      Chef::Application.fatal!("Unknown error processing config file #{config[:config_file]} with error #{error.message}", 2)
     end
 
   end
@@ -125,7 +118,7 @@ class Chef::Application
   # that a user has configured a log_location in client.rb, but is running
   # chef-client by hand to troubleshoot a problem.
   def configure_logging
-    Chef::Log.init(Chef::Config[:log_location])
+    Chef::Log.init(MonoLogger.new(Chef::Config[:log_location]))
     if want_additional_logger?
       configure_stdout_logger
     end
@@ -133,7 +126,7 @@ class Chef::Application
   end
 
   def configure_stdout_logger
-    stdout_logger = Logger.new(STDOUT)
+    stdout_logger = MonoLogger.new(STDOUT)
     STDOUT.sync = true
     stdout_logger.formatter = Chef::Log.logger.formatter
     Chef::Log.loggers <<  stdout_logger

data/lib/chef/application/apply.rb

@@ -79,6 +79,8 @@ class Chef::Application::Apply < Chef::Application
   end
 
   def reconfigure
+    parse_options
+    Chef::Config.merge!(config)
     configure_logging
   end
 

data/lib/chef/application/client.rb

@@ -58,8 +58,8 @@ class Chef::Application::Client < Chef::Application
   option :color,
     :long         => '--[no-]color',
     :boolean      => true,
-    :default      => true,
-    :description  => "Use colored output, defaults to enabled"
+    :default      => !Chef::Platform.windows?,
+    :description  => "Use colored output, defaults to false on Windows, true otherwise"
 
   option :log_level,
     :short        => "-l LEVEL",
@@ -184,10 +184,10 @@ class Chef::Application::Client < Chef::Application
     :long         => '--why-run',
     :description  => 'Enable whyrun mode',
     :boolean      => true
-  
+
   option :client_fork,
     :short        => "-f",
-    :long         => "--fork",
+    :long         => "--[no-]fork",
     :description  => "Fork client",
     :boolean      => true
 
@@ -209,6 +209,7 @@ class Chef::Application::Client < Chef::Application
 
   def initialize
     super
+    @exit_gracefully = false
   end
 
   # Reconfigure the chef client
@@ -217,9 +218,6 @@ class Chef::Application::Client < Chef::Application
     super
 
     Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url
-    unless Chef::Config[:exception_handlers].any? {|h| Chef::Handler::ErrorReport === h}
-      Chef::Config[:exception_handlers] << Chef::Handler::ErrorReport.new
-    end
 
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
@@ -277,6 +275,12 @@ class Chef::Application::Client < Chef::Application
         Chef::Log.info("SIGUSR1 received, waking up")
         SELF_PIPE[1].putc('.') # wakeup master process from select
       end
+
+      trap("TERM") do
+        Chef::Log.info("SIGTERM received, exiting gracefully")
+        @exit_gracefully = true
+        SELF_PIPE[1].putc('.')
+      end
     end
 
     if Chef::Config[:version]
@@ -289,6 +293,7 @@ class Chef::Application::Client < Chef::Application
 
     loop do
       begin
+        Chef::Application.exit!("Exiting", 0) if @exit_gracefully
         if Chef::Config[:splay]
           splay = rand Chef::Config[:splay]
           Chef::Log.debug("Splay sleep #{splay} seconds")
@@ -306,15 +311,11 @@ class Chef::Application::Client < Chef::Application
         else
           Chef::Application.exit! "Exiting", 0
         end
-      rescue Chef::Application::Wakeup => e
-        Chef::Log.debug("Received Wakeup signal.  Starting run.")
-        next
       rescue SystemExit => e
         raise
       rescue Exception => e
         if Chef::Config[:interval]
           Chef::Log.error("#{e.class}: #{e}")
-          Chef::Application.debug_stacktrace(e)
           Chef::Log.error("Sleeping for #{Chef::Config[:interval]} seconds before trying again")
           unless SELF_PIPE.empty?
             client_sleep Chef::Config[:interval]
@@ -324,7 +325,6 @@ class Chef::Application::Client < Chef::Application
           end
           retry
         else
-          Chef::Application.debug_stacktrace(e)
           Chef::Application.fatal!("#{e.class}: #{e.message}", 1)
         end
       end