Merge branch 'leverage-core-provider'

.gitignore

@@ -1,4 +1,15 @@
-.bundle
-.cache
+metadata.json
+.vagrant
 .kitchen
-bin
+Berksfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+/cookbooks
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*

CHANGELOG.md

@@ -3,16 +3,29 @@
 * [COOK-2254] - (formerly CHEF-154) Convert `runit_service` definition
   to a service resource named `runit_service`.
 
-This is a backwards incompatible version. Changes of Note:
+This version has some backwards incompatible changes (hence the major
+version bump). It is recommended that users pin the cookbook to the
+previous version where it is a dependency until this version has been
+tested (use version 0.16.2):
+
+    depends "runit", "<= 0.16.2"
+
+If you use Chef environments, pin the version in the appropriate
+environment(s).
+
+**Changes of note**
 
 1. The "runit" recipe must be included before the runit_service resource
 can be used.
-2. runit_service definition created a "service" resource. This is now a
-"runit_service" resource, for the purposes of notifications.
-3. enable action blocks waiting for supervise/ok after the service symlink
-is created.
-4. Create user-controlled services per the runit documentation.
-5. Some parameters in the definition have changed names in the resource.
+2. The `runit_service` definition created a separate `service`
+resource for notification purposes. This is still available, but the
+only actions that can be notified are `:start`, `:stop`, and `:restart`.
+3. The `:enable` action blocks waiting for supervise/ok after the
+service symlink is created.
+4. User-controlled services should be created per the runit
+documentation; see README.md for an example.
+5. Some parameters in the definition have changed names in the
+resource. See below.
 
 The following parameters in the definition are renamed in the resource
 to clarify their intent.

README.md

@@ -108,17 +108,23 @@ more information on the `sv` program.
 
 ## Parameter Attributes
 
-The first two parameters, `sv_dir` and `service_dir`, have hardcoded
-default values instead of using the node attributes because of the way
-that Chef loads cookbook components, the attributes will not be
-available. See __Usage__ for examples.
+The first three parameters, `sv_dir`, `service_dir`, and `sv_bin` will
+attempt to use the corresponding node attributes, and fall back to
+hardcoded default values that match the settings used on Debian
+platform systems.
 
 Many of these parameters are only used in the `:enable` action.
 
 - **sv_dir** - The base "service directory" for the services managed by
-   the resource. Default is `/etc/sv`.
+   the resource. By default, this will attempt to use the
+   `node['runit']['sv_dir']` attribute, and falls back to `/etc/sv`.
 - **service_dir** - The directory where services are symlinked to be
-   supervised by `runsvdir`. Default is `/etc/service`.
+   supervised by `runsvdir`. By default, this will attempt to use the
+   `node['runit']['service_dir']` attribute, and falls back to
+   `/etc/service`.
+- **sv_bin** - The path to the `sv` program binary. This will attempt
+    to use the `node['runit']['sv_bin']` attribute, and falls back to
+    `/usr/bin/sv`.
 - **service_name** - *Name attribute*. The name of the service. This
    will be used in the directory of the managed service in the
    `sv_dir` and `service_dir`.
@@ -166,7 +172,6 @@ Unlike previous versions of the cookbook using the `runit_service`
 definition, the `runit_service` resource can be notified. See
 __Usage__ examples below.
 
-
 Usage
 =====