chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "October 2013" "Chef 11.6.2" "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" "November 2014" "Chef 10.34.6" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "October 2013" "Chef 11.6.2" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

data/distro/common/markdown/man1/{shef.mkd → chef-shell.mkd}

@@ -1,9 +1,9 @@
-shef(1) -- Interactive Chef Console
-========================================
+chef-shell(1) -- Interactive Chef Console
+=========================================
 
 ## SYNOPSIS
 
-__shef__ [_named configuration_] _(options)_
+__chef-shell__ [_named configuration_] _(options)_
 
   * `-S`, `--server CHEF_SERVER_URL`:
     The chef server URL
@@ -16,33 +16,37 @@ __shef__ [_named configuration_] _(options)_
   * `-l`, `--log-level LOG_LEVEL`:
     Set the logging level
   * `-s`, `--solo`:
-    chef-solo shef session
+    chef-solo session
   * `-a`, `--standalone`:
-    standalone shef session
+    standalone session
   * `-v`, `--version`:
     Show chef version
   * `-h`, `--help`:
     Show command options
 
-When no --config option is specified, shef attempts to load a default configuration file:
+When no --config option is specified, chef-shell attempts to load a
+default configuration file:
 
-* If a _named configuration_ is given, shef will load ~/.chef/_named
-  configuration_/shef.rb
-* If no _named configuration_ is given shef will load ~/.chef/shef.rb if it exists
-* Shef falls back to loading /etc/chef/client.rb or /etc/chef/solo.rb if -z or
-  -s options are given and no shef.rb can be found.
+* If a _named configuration_ is given, chef-shell will load ~/.chef/_named
+  configuration_/chef_shell.rb
+* If no _named configuration_ is given chef-shell will load
+  ~/.chef/chef_shell.rb if it exists
+* chef-shell falls back to loading /etc/chef/client.rb or
+/etc/chef/solo.rb if -z or -s options are given and no chef_shell.rb
+can be found.
 * The --config option takes precedence over implicit configuration
   paths.
 
 ## DESCRIPTION
 
-`shef` is an irb(1) (interactive ruby) session customized for Chef.
-`shef` serves two primary functions: it provides a means to
+`chef-shell` is an irb(1) (interactive ruby) session customized for Chef.
+`chef-shell` serves two primary functions: it provides a means to
 interact with a Chef Server interactively using a convenient DSL; it
 allows you to define and run Chef recipes interactively.
 
 ## SYNTAX
-Shef uses irb's subsession feature to provide multiple modes of
+
+chef-shell uses irb's subsession feature to provide multiple modes of
 interaction. In addition to the primary mode which is entered on start,
 `recipe` and `attributes` modes are available.
 
@@ -61,7 +65,7 @@ session:
   * `run_chef`:
     Initiates a chef run
   * `reset`:
-    reinitializes shef
+    reinitializes chef-shell session
   * `echo :on|:off`:
     Turns irb's echo function on or off. Echo is _on_ by default.
   * `tracing :on|:off`:
@@ -73,10 +77,11 @@ session:
   * `ohai`:
     Prints the attributes of _node_
 
-In addition to these commands, shef provides a DSL for accessing data on
-the Chef Server. When working with remote data in shef, you chain method
-calls in the form _object type_._operation_, where _object type_ is in
-plural form. The following object types are available:
+In addition to these commands, chef-shell provides a DSL for accessing
+data on the Chef Server. When working with remote data in chef-shell, you
+chain method calls in the form _object type_._operation_, where
+_object type_ is in plural form. The following object types are
+available:
 
   * `nodes`
   * `roles`
@@ -136,54 +141,55 @@ convergence run via `run_chef`
 
 * A "Hello World" interactive recipe
 
-  chef > recipe  
-  chef:recipe > echo :off  
-  chef:recipe > file "/tmp/hello\_world"  
-  chef:recipe > run\_chef  
-  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: Processing file[/tmp/hello\_world] action create ((irb#1) line 2)  
-  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: file[/tmp/hello\_world] created file /tmp/hello\_world  
-  chef:recipe > pp ls '/tmp'  
-  [".",  
-  "..",  
-  "hello\_world"]  
+  chef > recipe
+  chef:recipe > echo :off
+  chef:recipe > file "/tmp/hello\_world"
+  chef:recipe > run\_chef
+  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: Processing file[/tmp/hello\_world] action create ((irb#1) line 2)
+  [Sat, 09 Apr 2011 08:56:56 -0700] INFO: file[/tmp/hello\_world] created file /tmp/hello\_world
+  chef:recipe > pp ls '/tmp'
+  [".",
+  "..",
+  "hello\_world"]
 
 * Search for _nodes_ by role, and print their IP addresses
 
-  chef > nodes.find(:roles => 'monitoring-server') {|n| n[:ipaddress] }  
-  => ["10.254.199.5"]  
+  chef > nodes.find(:roles => 'monitoring-server') {|n| n[:ipaddress] }
+  => ["10.254.199.5"]
 
 * Remove the role _obsolete_ from every node in the system
 
-  chef > nodes.transform(:all) {|n| n.run\_list.delete('role[obsolete]') }  
-   => [node[chef098b2.opschef.com], node[ree-woot], node[graphite-dev], node[fluke.localdomain], node[ghost.local], node[kallistec]]  
+  chef > nodes.transform(:all) {|n| n.run\_list.delete('role[obsolete]') }
+   => [node[chef098b2.opschef.com], node[ree-woot], node[graphite-dev], node[fluke.localdomain], node[ghost.local], node[kallistec]]
 
 
 ## BUGS
-The name `shef` is clever in print but is confusing when spoken aloud.
-Pronouncing `shef` as `chef console` is an imperfect workaround.
 
-`shef` often does not perfectly replicate the context in which
+`chef-shell` often does not perfectly replicate the context in which
 chef-client(8) configures a host, which may lead to discrepancies in
 observed behavior.
 
-`shef` has to duplicate much code from chef-client's internal libraries
-and may become out of sync with the behavior of those libraries.
+`chef-shell` has to duplicate much code from chef-client's internal
+libraries and may become out of sync with the behavior of those
+libraries.
 
 ## SEE ALSO
+
   chef-client(8) knife(1)
-  <http://wiki.opscode.com/display/chef/Shef>
+  <http://wiki.opscode.com/display/chef/Chef+Shell>
 
 ## AUTHOR
+
    Chef was written by Adam Jacob <adam@opscode.com> with many
-   contributions from the community. Shef was written by Daniel DeLeo.
+   contributions from the community. chef-shell was written by Daniel
+   DeLeo.
 
 ## DOCUMENTATION
+
    This manual page was written by Daniel DeLeo <dan@opscode.com>.
    Permission is granted to copy, distribute and / or modify this
    document under the terms of the Apache 2.0 License.
 
 ## CHEF
-   Shef is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>
-
-
 
+   chef-shell is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>

data/distro/common/markdown/man1/knife-exec.mkd

@@ -9,13 +9,15 @@ __knife__ __exec__ _(options)_
     Provide a snippet of code to evaluate on the command line
 
 ## DESCRIPTION
-`knife exec` runs arbitrary ruby scripts in a context similar to that of
-the shef(1) DSL. See the shef documentation for a description of the
-commands available.
+
+`knife exec` runs arbitrary ruby scripts in a context similar to that
+of the chef-shell(1) DSL. See the chef-shell documentation for a
+description of the commands available.
 
 ## EXAMPLES
+
   * Make an API call against an arbitrary endpoint:
-    knife exec -E 'api.get("nodes/fluke.localdomain/cookbooks")'  
+    knife exec -E 'api.get("nodes/fluke.localdomain/cookbooks")'
     => list of cookbooks for the node _fluke.localdomain_
   * Remove the role _obsolete_ from all nodes:
     knife exec -E 'nodes.transform(:all){|n| n.run\_list.delete("role[obsolete]")}'
@@ -23,15 +25,18 @@ commands available.
     knife exec -E 'nodes.find(:roles => "webserver") {|n| n.expand!; n[:recipes]}'
 
 ## SEE ALSO
-   __shef(1)__
+
+   __chef-shell(1)__
 
 ## AUTHOR
+
    Chef was written by Adam Jacob <adam@opscode.com> with many contributions from the community.
 
 ## DOCUMENTATION
+
    This manual page was written by Joshua Timberman <joshua@opscode.com>.
    Permission is granted to copy, distribute and / or modify this document under the terms of the Apache 2.0 License.
 
 ## CHEF
-   Knife is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>
 
+   Knife is distributed with Chef. <http://wiki.opscode.com/display/chef/Home>

data/distro/common/markdown/man1/knife.mkd

@@ -98,14 +98,9 @@ If the config file exists, knife uses these settings for __GENERAL OPTIONS__ def
   * `chef_server_url`:
     URL of the Chef server. Corresponds to the `-s` or `--server-url`
     option. This is requested from the user when running this sub-command.
-  * `cache_type`:
-    The type of cache to use. Default is BasicFile. This can be any type of
-    Cache that moneta supports: BasicFile, Berkeley, Couch, DataMapper,
-    File, LMC, Memcache, Memory, MongoDB, Redis, Rufus, S3, SDBM, Tyrant,
-    Xattr, YAML.
-  * `cache_options`:
-    Specifies various options to use for caching. These options are
-    dependent on the `cache_type`.
+  * `syntax_check_cache_path`:
+    Specifies the path to a directory where knife caches information
+    about files that it has syntax checked.
   * `validation_client_name`:
     Specifies the name of the client used to validate new clients.
   * `validation_key`:
@@ -183,7 +178,7 @@ recommended though, and git fits with a lot of the workflow paradigms.
     data editing entirely.
 
 ## SEE ALSO
-  __chef-client(8)__ __chef-server(8)__ __shef(1)__
+  __chef-client(8)__ __chef-server(8)__ __chef-shell(1)__
 
   __knife-bootstrap(1)__ __knife-client(1)__ __knife-configure(1)__
   __knife-cookbook-site(1)__ __knife-cookbook(1)__ __knife-data-bag(1)__

data/distro/debian/etc/default/chef-client

@@ -2,4 +2,3 @@ LOGFILE=/var/log/chef/client.log
 CONFIG=/etc/chef/client.rb
 INTERVAL=1800
 SPLAY=20
-STARTTIME=1

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

@@ -41,7 +41,7 @@ running_pid() {
   name=$2
   [ -z "$pid" ] && return 1
   [ ! -d /proc/$pid ] &&  return 1
-  cmd=`cat /proc/$pid/cmdline | tr '\000' '\n' | awk 'NR==2'`
+  cmd=`awk '/Name:/ {print $2}' /proc/$pid/status`
   [ "$cmd" != "$name" ] &&  return 1
   return 0
 }
@@ -49,7 +49,7 @@ running_pid() {
 running() {
   [ ! -f "$PIDFILE" ] && return 1
   pid=`cat $PIDFILE`
-  running_pid $pid $DAEMON || return 1
+  running_pid $pid $NAME || return 1
   return 0
 }
 
@@ -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."