chef 12.0.0.alpha.2 → 12.0.0.rc.0

data/CONTRIBUTING.md

@@ -159,6 +159,15 @@ In order to decrease the back and forth an issues and help us get to the bottom
 [What actually happens after the reproduction steps?]
 ```
 
+### Useful Github Queries
+
+Contributions go through a review process to improve code quality and avoid regressions. Managing a large number of contributions requires a workflow to provide queues for work such as triage, code review, and merging. A semi-formal process has evolved over the life of the project. Chef maintains this process pending community development and acceptance of an [RFC](https://github.com/opscode/chef-rfc). These queries will help track contributions through this process:
+
+* [Issues that are not assigned to a team](https://github.com/opscode/chef/issues?q=is%3Aopen+-label%3AAIX+-label%3ABSD+-label%3Awindows+-label%3A%22Chef+Core%22++-label%3A%22Dev+Tools%22+-label%3AUbuntu+-label%3A%22Enterprise+Linux%22+-label%3A%22Ready+For+Merge%22+-label%3AMac+-label%3ASolaris+)
+* [Untriaged Issues](https://github.com/opscode/chef/issues?q=is%3Aopen+is%3Aissue+-label%3ABug+-label%3AEnhancement+-label%3A%22Tech+Cleanup%22+-label%3A%22Ready+For+Merge%22)
+* [PRs to be Reviewed](https://github.com/opscode/chef/labels/Pending%20Maintainer%20Review)
+* [Suitable for First Contribution](https://github.com/opscode/chef/labels/Easy)
+
 ## <a name="release"></a> Chef Release Cycles
 
 Our primary shipping vehicle is operating system specific packages that includes

data/README.md

@@ -33,7 +33,7 @@ emerge, etc.):
 * git
 * C compiler, header files, etc. On Ubuntu/debian, use the
   `build-essential` package.
-* ruby 1.8.7 or later (1.9.3+ recommended)
+* ruby 1.9.3 or later
 * rubygems
 * bundler
 

data/Rakefile

@@ -52,6 +52,18 @@ task :pedant do
   require File.expand_path('spec/support/pedant/run_pedant')
 end
 
+task :build_eventlog do
+  Dir.chdir 'ext/win32-eventlog/' do
+    system 'rake build'
+  end
+end
+
+task :register_eventlog do
+  Dir.chdir 'ext/win32-eventlog/' do
+    system 'rake register'
+  end
+end
+
 begin
   require 'yard'
   DOC_FILES = [ "README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb" ]

data/bin/chef-service-manager

@@ -28,7 +28,7 @@ if Chef::Platform.windows?
     :service_name => "chef-client",
     :service_display_name => "Chef Client Service",
     :service_description => "Runs Chef Client on regular, configurable intervals.",
-    :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../lib/chef/application/windows_service.rb'))
+    :service_file_path => File.expand_path(File.join(File.dirname(__FILE__), '../../../../bin/chef-windows-service'))
   }
   Chef::Application::WindowsServiceManager.new(chef_client_service).run
 else

data/bin/chef-windows-service

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+#
+# Author:: Jay Mundrawala (<jdm@getchef.com>)
+#
+# Copyright:: 2014, Chef Software, Inc.
+#
+# 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.
+#
+
+# Note:
+# The file is used by appbundler to generate a ruby file that
+# we can execute using the correct gems. The batch file we 
+# generate will call that file, and will be registered as
+# a windows service.
+
+require 'rubygems'
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require 'chef'
+require 'chef/application/windows_service'
+
+if Chef::Platform.windows?
+  Chef::Application::WindowsService.mainloop
+else
+  puts "chef-windows-service is only available on Windows platforms."
+end

data/distro/common/html/_sources/ctl_chef_server.txt

@@ -4,23 +4,320 @@ chef-server-ctl
 
 .. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server.rst
 
-Options
+backup-recover
 =====================================================
-.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_options.rst
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_backup_recover.rst
 
+cleanse
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_cleanse.rst
+
+gather-logs
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_gather_logs.rst
+
+ha-status
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_ha_status.rst
+
+help
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_help.rst
+
+install
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install.rst
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_install_table.rst
+
+master-recover
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_master_recover.rst
+
+org-associate
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_associate.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_associate_syntax.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-associate prod john_smith
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-associate preprod testmaster
+
+
+org-create
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_create.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_create_syntax.rst
+
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_create_options.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-create prod Production
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-create staging Staging -a chef-admin
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-create dev Development -f /tmp/id-dev.key
+
+
+org-delete
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_delete.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_delete_syntax.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-delete infra-testing-20140909
+
+
+.. code-block:: bash
+      
+   $ chef-server-ctl org-delete pedant-testing-org
+
+
+org-disassociate
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_disassociate.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_disassociate_syntax.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl org-disassociate prod john_smith
+
+
+.. code-block:: bash
+
+      $ chef-server-ctl org-disassociate prod testmaster
+
+
+org-list
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_syntax.rst
+
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_list_options.rst
+
+org-show
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_org_show_syntax.rst
+
+password
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_password.rst
+
+reconfigure
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_reconfigure.rst
+
+show-config
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_show_config.rst
+
+uninstall
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_uninstall.rst
+
+upgrade
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_upgrade.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_upgrade_syntax.rst
+
+**Options**
+
+.. note:: Options for the ``upgrade`` subcommand may only be used when upgrading from |chef server osc| 11 to |chef server| 12.
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_upgrade_options.rst
+
+user-create
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_create.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_create_syntax.rst
 
-Examples
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_create_options.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-create john_smith John Smith john_smith@example.com insecure-passord
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-create jane_doe Jane Doe jane_doe@example.com PaSSword -f /tmp/jane_doe.key
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-create waldendude Henry David Thoreau waldendude@example.com excursions
+
+
+user-delete
 =====================================================
-The following examples show how to use |chef server ctl| to manage services.
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_delete.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_delete_syntax.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-delete john_smith
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-delete jane_doe
+
+user-edit
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_edit.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_edit_syntax.rst
+
+**Examples**
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-edit john_smith
+
+
+.. code-block:: bash
+
+   $ chef-server-ctl user-edit jane_doe
+
+
+user-list
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_list.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_list_syntax.rst
+
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_list_options.rst
+
+user-show
+=====================================================
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_show.rst
+
+**Syntax**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_show_syntax.rst
+
+**Options**
+
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_user_show_options.rst
+
+Service Subcommands
+=====================================================
+The |chef server| has a built in process supervisor, which ensures that all of the required services are in the appropriate state at any given time. The supervisor starts two processes per service.
+
+hup
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_hup.rst
+
+int
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_int.rst
+
+kill
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_kill.rst
+
+once
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_once.rst
+
+restart
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_restart.rst
+
+service-list
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_service_list.rst
+
+start
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_start.rst
+
+status
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_status.rst
 
-**View the status of a service**
+High Availability
++++++++++++++++++++++++++++++++++++++++++++++++++++++
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_status_ha.rst
 
-.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_view_service_status.rst
+Log Files
++++++++++++++++++++++++++++++++++++++++++++++++++++++
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_status_logs.rst
 
-**Restart a service**
+stop
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_stop.rst
 
-.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_restart_service.rst
+tail
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_tail.rst
 
-**Restart all services**
+term
+-----------------------------------------------------
+.. include:: ../../includes_ctl_chef_server/includes_ctl_chef_server_term.rst
 
-.. include:: ../../step_ctl_chef_server/step_ctl_chef_server_restart_all_services.rst

data/distro/common/html/ctl_chef_client.html

@@ -28,7 +28,7 @@
   </head>
   <body>
 <div style="background-color: #212c35; text-align: left; padding: 0px 0px 0px 0px">
-<a href="http://docs.opscode.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
+<a href="http://docs.getchef.com/"><img src="_static/chef_html_logo.png" border="0" alt="Chef"/></a>
 </div>
 
 
@@ -41,7 +41,7 @@
             
   <div class="section" id="chef-client">
 <h1>chef-client<a class="headerlink" href="#chef-client" title="Permalink to this headline">¶</a></h1>
-<p>A chef-client is an agent that runs locally on every node that is registered with the Chef server. When a chef-client is run, it will perform all of the steps that are required to bring the node into the expected state, including:</p>
+<p>A chef-client is an agent that runs locally on every node that is under management by Chef. When a chef-client is run, it will perform all of the steps that are required to bring the node into the expected state, including:</p>
 <ul class="simple">
 <li>Registering and authenticating the node with the Chef server</li>
 <li>Building the node object</li>
@@ -50,10 +50,6 @@
 <li>Taking the appropriate and required actions to configure the node</li>
 <li>Looking for exceptions and notifications, handling each as required</li>
 </ul>
-<div class="admonition note">
-<p class="first admonition-title">Note</p>
-<p class="last">The chef-client executable can be run as a daemon.</p>
-</div>
 <p>The chef-client executable is run as a command-line tool.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -116,7 +112,7 @@
 <dt><tt class="docutils literal"><span class="pre">-P</span> <span class="pre">PID_FILE</span></tt>, <tt class="docutils literal"><span class="pre">--pid</span> <span class="pre">PID_FILE</span></tt></dt>
 <dd>The location in which a process identification number (pid) is saved. An executable, when started as a daemon, will write the pid to the specified file. Default value: <tt class="docutils literal"><span class="pre">/tmp/name-of-executable.pid</span></tt>.</dd>
 <dt><tt class="docutils literal"><span class="pre">-R</span></tt>, <tt class="docutils literal"><span class="pre">--enable-reporting</span></tt></dt>
-<dd>Use to enable data collection reporting during a chef-client run.</dd>
+<dd>Use to enable Chef reporting, which performs data collection during a chef-client run.</dd>
 <dt><tt class="docutils literal"><span class="pre">-s</span> <span class="pre">SECONDS</span></tt>, <tt class="docutils literal"><span class="pre">--splay</span> <span class="pre">SECONDS</span></tt></dt>
 <dd>A number (in seconds) to add to the <tt class="docutils literal"><span class="pre">interval</span></tt> that is used to determine the frequency of chef-client runs. This number can help prevent server load when there are many clients running at the same time.</dd>
 <dt><tt class="docutils literal"><span class="pre">-S</span> <span class="pre">CHEF_SERVER_URL</span></tt>, <tt class="docutils literal"><span class="pre">--server</span> <span class="pre">CHEF_SERVER_URL</span></tt></dt>