Merge branch 'master' of github.com:zuazo/ssl_certificate-cookbook

Author: zuazo

Diff for: .travis.yml

@@ -1,18 +1,10 @@
-rvm:
-- 2.2
-- 2.3
+rvm: 2.3
 
 sudo: required
 
 env:
 - CHEF_VERSION="~> 12.0"
 
-matrix:
-  exclude:
-  # Chef 12.9 requires Ruby >= 2.1
-  - rvm: 2.0.0
-    env: CHEF_VERSION="~> 12.0"
-
 before_install:
 - gem install bundler # Update bundler
 - gem update --system # https://github.com/sickill/rainbow/issues/48

Diff for: README.md

@@ -78,7 +78,7 @@ Please, [let us know](https://github.com/zuazo/ssl_certificate-cookbook/issues/n
 ## Required Applications
 
 * Chef `12` or higher.
-* Ruby `2.2` or higher.
+* Ruby `2.3` or higher.
 
 Usage
 =====
@@ -161,6 +161,7 @@ When a namespace is set in the resource, it will try to read the following attri
 | `namespace['ssl_chain']['name']`                   | File name to be used for the intermediate certificate chain file. **If this is not present, no chain file will be written.**
 | `namespace['ssl_chain']['source']`                 | Source type to get the intermediate certificate chain from. Can be `'attribute'`, `'data-bag'`, `'chef-vault'` or `'file'`.
 | `namespace['ssl_chain']['path']`                   | File path of the intermediate SSL certificate chain.
+| `namespace['ssl_chain']['combined_path']`          | File path of the combined certificates (intermediate chain + domain certificate).
 | `namespace['ssl_chain']['bag']`                    | Name of the Data Bag where the intermediate certificate chain is stored.
 | `namespace['ssl_chain']['item']`                   | Name of the Data Bag Item where the intermediate certificate chain is stored.
 | `namespace['ssl_chain']['item_key']`               | Key of the Data Bag Item where the intermediate certificate chain is stored.

Diff for: libraries/resource_ssl_certificate_chain.rb

@@ -208,8 +208,8 @@ def default_chain_content
         end
 
         def default_chain_combined_path
-          lazy do
-            @default_chain_combined_path ||=
+          lazy_cached_variable(:default_chain_combined_path) do
+            read_namespace(%w(ssl_chain combined_path)) ||
               ::File.join(cert_dir, chain_combined_name)
           end
         end