chef 0.10.8 → 0.10.10.beta.1

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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "KNIFE" "1" "April 2012" "Chef 0.10.10.beta.1" "Chef Manual"
 .
 .SH "NAME"
 \fBknife\fR \- Chef Server API client utility
@@ -96,7 +96,7 @@ Which format to use for output\. See FORMATS for details\.
 More verbose output\. Use twice for max verbosity
 .
 .TP
-\fB\-n\fR, \fB\-\-no\-editor\fR
+\fB\-d\fR, \fB\-\-disable\-editing\fR
 Do not open EDITOR, just accept the data as is
 .
 .TP
@@ -120,12 +120,8 @@ Say yes to all prompts for confirmation
 Accept default values for all questions
 .
 .TP
-\fB\-\-color\fR
-Use colored output
-.
-.TP
-\fB\-\-no\-color\fR
-Don\'t use colors in the output
+\fB\-\-[no\-]color\fR
+Use colored output\. Color enabled by default\.
 .
 .TP
 \fB\-h\fR, \fB\-\-help\fR
@@ -256,7 +252,7 @@ A note about git: Opscode and many folks in the Chef community use git, but it i
 .
 .TP
 \fBEDITOR\fR
-The text editor to use for editing data\. The \-\-editor option takes precedence over this value, and the \-\-no\-editor option supresses data editing entirely\.
+The text editor to use for editing data\. The \-\-editor option takes precedence over this value, and the \-\-disable\-editing option supresses data editing entirely\.
 .
 .SH "SEE ALSO"
 \fBchef\-client(8)\fR \fBchef\-server(8)\fR \fBshef(1)\fR

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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "SHEF" "1" "April 2012" "Chef 0.10.10.beta.1" "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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-CLIENT" "8" "April 2012" "Chef 0.10.10.beta.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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-EXPANDER" "8" "April 2012" "Chef 0.10.10.beta.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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-EXPANDERCTL" "8" "April 2012" "Chef 0.10.10.beta.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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-SERVER\-WEBUI" "8" "April 2012" "Chef 0.10.10.beta.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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-SERVER" "8" "April 2012" "Chef 0.10.10.beta.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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-SOLO" "8" "April 2012" "Chef 0.10.10.beta.1" "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" "December 2011" "Chef 0.10.8" "Chef Manual"
+.TH "CHEF\-SOLR" "8" "April 2012" "Chef 0.10.10.beta.1" "Chef Manual"
 .
 .SH "NAME"
 \fBchef\-solr\fR \- Runs as Chef\'s search server

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

@@ -29,8 +29,8 @@ __knife__ __bootstrap__ _(options)_
     Execute the bootstrap via sudo
   * `-d`, `--distro DISTRO`:
     Bootstrap a distro using a template
-  * `--no-host-key-verify`:
-    Disable host key verification
+  * `--[no-]host-key-verify`:
+    Enable host key verification, which is the default behavior.
 
 ## DESCRIPTION
 
@@ -61,11 +61,7 @@ target node (FQDN). The following distros are supported:
 * ubuntu10.04-apt
 
 The gems installations will use RubyGems 1.3.6 and Chef installed as a
-gem. The apt installation will use the Opscode APT repository. The
-RubyGems installation requires installing gems with native extensions,
-so development related packages (ruby-dev, build-essential) are
-installed. These are not installed with the apt installation, as native
-extensions are already compiled in the required packages.
+gem. The apt installation will use the Opscode APT repository.
 
 In addition to handling the software installation, these bootstrap
 templates do the following:

data/distro/common/markdown/man1/knife-cookbook-site.mkd

@@ -11,8 +11,8 @@ __knife__ __cookbook site__ _sub-command_ _(options)_
 ## INSTALL
 __cookbook site install COOKBOOK [VERSION]__ _(options)_
 
-  * `-D`, `--no-dependencies `:
-    Do not install dependencies automatically
+  * `-D`, `--skip-dependencies `:
+    Skip automatic installation of dependencies.
   * `-o`, `--cookbook-path PATH`:
     Install cookbooks to PATH
   * `-B`, `--branch BRANCH`:
@@ -35,7 +35,7 @@ changes as a separate patch.  When an updated upstream version becomes
 available, you will be able to merge the upstream changes while
 maintaining your local modifications.
 
-Unless _-D_ is specified, the process is applied recursively to all the
+Unless _--skip-dependencies_ is specified, the process is applied recursively to all the
 cookbooks _COOKBOOK_ depends on (via metadata _dependencies_).
 
 ## DOWNLOAD

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

@@ -41,7 +41,7 @@ regular expression literals in scripting languages).
 ## CREATE
 __knife node create__ _name_ _(options)_
 
-Create a new node. Unless the --no-editor option is given, an empty node
+Create a new node. Unless the --disable-editing option is given, an empty node
 object will be created and displayed in your text editor. If the editor
 exits with a successful exit status, the node data will be posted to the
 Chef Server to create the node.
@@ -100,7 +100,7 @@ __knife node show__ _node name_ _(options)_
     Display more, but not all, of the node's data when using the default
     _summary_ format
 
-Displays the node identified by _node name_ on stdout. 
+Displays the node identified by _node name_ on stdout.
 
 ## RUN LIST ITEM FORMAT
 Run list items may be either roles or recipes. When adding a role to a

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

@@ -19,11 +19,8 @@ __knife__ __ssh QUERY COMMAND__ _(options)_
     The SSH identity file used for authentication
   * `-p`, `--ssh-port PORT`:
     The ssh port
-  * `-i`, `--identity-file IDENTITY_FILE`:
-    The SSH identity file used for authentication
-  * `--no-host-key-verify`:
-    Disable host key verification
-    
+  * `--[no-]host-key-verify`:
+    Verify host key, enabled by default.
 
 ## DESCRIPTION
 

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

@@ -48,7 +48,7 @@ documentation using `knife help TOPIC`.
     Which format to use for output. See FORMATS for details.
   * `-V`, `--verbose`:
     More verbose output.  Use twice for max verbosity
-  * `-n`, `--no-editor`:
+  * `-d`, `--disable-editing`:
     Do not open EDITOR, just accept the data as is
   * `-u`, `--user` USER:
     API Client Username, corresponds to `Chef::Config` `node_name`.
@@ -60,10 +60,8 @@ documentation using `knife help TOPIC`.
     Say yes to all prompts for confirmation
   * `--defaults`:
     Accept default values for all questions
-  * `--color`:
-    Use colored output
-  * `--no-color`:
-    Don't use colors in the output
+  * `--[no-]color`:
+    Use colored output. Color enabled by default.
   * `-h`, `--help`:
     Show the available options for a command.
 
@@ -124,7 +122,7 @@ If the config file exists, knife uses these settings for __GENERAL OPTIONS__ def
     and is listed as the license in the cookbook metadata. Currently
     supported licenses are "apachev2" and "none". Any other values will
     result in an empty license in the metadata (needs to be filled in by the
-    author), and no comment preamble in the default recipe. Currently supported 
+    author), and no comment preamble in the default recipe. Currently supported
     readme formats are "md", "mkd", "txt", and "rdoc".  Any other value will
     result in an unformatted README.
 
@@ -134,7 +132,7 @@ _~/.chef/knife.rb_
 
 Ruby DSL configuration file for knife. See __CONFIGURATION__.
 
-## FORMATS 
+## FORMATS
 
 The amount of content displayed and the output format are
 modified by the `--format` option. If no alternate format is selected,
@@ -145,7 +143,7 @@ Valid formats are:
   * `summary`:
     displays the node in a custom, summarized format (default)
   * `text`:
-    displays the node data in its entirety using the colorized tree display 
+    displays the node data in its entirety using the colorized tree display
   * `json`:
     displays the node in JSON format
   * `yaml`:
@@ -181,7 +179,7 @@ recommended though, and git fits with a lot of the workflow paradigms.
 ## ENVIRONMENT
   * `EDITOR`:
     The text editor to use for editing data. The --editor option takes
-    precedence over this value, and the --no-editor option supresses
+    precedence over this value, and the --disable-editing option supresses
     data editing entirely.
 
 ## SEE ALSO

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

@@ -88,6 +88,19 @@ reload_server() {
    return $errcode
 }
 
+run_server() {
+  if [ -z "$DAEMONUSER" ] ; then
+     killproc -p $PIDFILE $DAEMON -USR1
+     errcode=$?
+   else
+     start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE \
+       --user $DAEMONUSER \
+       --exec $DAEMON
+     errcode=$?
+   fi
+   return $errcode
+}
+
 force_stop() {
   [ ! -e "$PIDFILE" ] && return
   if running ; then
@@ -174,9 +187,17 @@ case "$1" in
       log_end_msg $errcode
     fi
     ;;
+  run)
+    if running; then
+      log_daemon_msg "Triggering run of $DESC" "$NAME"
+      errcode=0
+      run_server || errcode=$?
+      log_end_msg $errcode
+    fi
+    ;;
   *)
     N=/etc/init.d/$NAME
-    echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+    echo "Usage: $N {start|stop|force-stop|restart|force-reload|status|run}" >&2
     exit 1
     ;;
 esac

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

@@ -64,6 +64,14 @@ reload() {
     return $retval 
 }
 
+run() {
+    echo -n $"Triggering run of $prog: "
+    killproc -p $pidfile chef-client -USR1
+    retval=$?
+    echo
+    return $retval
+}
+
 force_reload() {
     restart
 }
@@ -103,8 +111,11 @@ case "$1" in
         rh_status_q || exit 0
         restart
         ;;
+    run)
+        $1
+        ;;
     *)
-        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|run}"
         exit 2
 esac
 exit $?

data/distro/windows/service_manager.rb

@@ -0,0 +1,164 @@
+#
+# Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# 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