diff options
| author | Tim Smith <tsmith@chef.io> | 2019-01-17 12:08:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-17 12:08:32 -0800 |
| commit | 157ce30298f08f302dd95b94761507254fdecc4e (patch) | |
| tree | 87d9e3ef3b488e21ef3eab4e719722105e42b12e | |
| parent | 875f23b93444cc6621f3446f8036079beb9b713f (diff) | |
| parent | 82ac2c40763dfe57cd2efaa07126d26829716cf2 (diff) | |
| download | chef-157ce30298f08f302dd95b94761507254fdecc4e.tar.gz | |
Merge pull request #8122 from chef/openssl
openssl_ec_private_key / openssl_x509_request.rb: properly use the path properties when specified
| -rw-r--r-- | lib/chef/resource/openssl_ec_private_key.rb | 2 | ||||
| -rw-r--r-- | lib/chef/resource/openssl_x509_request.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb index 06fec2939b..dc8cd060d6 100644 --- a/lib/chef/resource/openssl_ec_private_key.rb +++ b/lib/chef/resource/openssl_ec_private_key.rb @@ -67,7 +67,7 @@ class Chef unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass) converge_by("Create an EC private key #{new_resource.path}") do log "Generating an #{new_resource.key_curve} "\ - "EC key file at #{new_resource.name}, this may take some time" + "EC key file at #{new_resource.path}, this may take some time" if new_resource.key_pass unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve) diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index 6e5e182f31..affc761723 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -88,7 +88,7 @@ class Chef unless ::File.exist? new_resource.path converge_by("Create CSR #{@new_resource}") do - file new_resource.name do + file new_resource.path do owner new_resource.owner unless new_resource.owner.nil? group new_resource.group unless new_resource.group.nil? mode new_resource.mode unless new_resource.mode.nil? |