diff options
| author | Tim Smith <tsmith@chef.io> | 2018-08-24 12:11:56 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-08-24 12:11:56 -0700 |
| commit | c3951d2cc25f48aa29d505a68ecb83ed32c78bff (patch) | |
| tree | 37a115761c7e682f05e5d0e23148a7ee0d987d05 | |
| parent | a749e76cad7b89ae21ac09f03ea17272ad2ab6dd (diff) | |
| download | chef-c3951d2cc25f48aa29d505a68ecb83ed32c78bff.tar.gz | |
Remove mode defaults from x509_certificate / x509_request
Just let the file resource handle this unless the user passes something. This will prevent warnings on Windows hosts.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/resource/openssl_x509_certificate.rb | 7 | ||||
| -rw-r--r-- | lib/chef/resource/openssl_x509_request.rb | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/chef/resource/openssl_x509_certificate.rb b/lib/chef/resource/openssl_x509_certificate.rb index 04641e877b..00058f65d0 100644 --- a/lib/chef/resource/openssl_x509_certificate.rb +++ b/lib/chef/resource/openssl_x509_certificate.rb @@ -44,8 +44,7 @@ class Chef default: 365 property :mode, [Integer, String], - description: "The permission mode of all files created by the resource.", - default: "0644" + description: "The permission mode of all files created by the resource." property :country, String, description: "Value for the C ssl field." @@ -116,9 +115,9 @@ class Chef converge_by("Create #{@new_resource}") do file new_resource.path do action :create_if_missing - mode new_resource.mode 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? sensitive true content cert.to_pem end @@ -126,9 +125,9 @@ class Chef if new_resource.csr_file.nil? file new_resource.key_file do action :create_if_missing - mode new_resource.mode 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? sensitive true content key.to_pem end diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index a7b989d96d..071978a961 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -37,8 +37,8 @@ class Chef property :group, String, description: "The group of all files created by the resource." - property :mode, [Integer, String], default: "0644", - description: "" + property :mode, [Integer, String], + description: "The permission mode of all files created by the resource." property :country, String, description: "Value for the C ssl field." @@ -90,15 +90,15 @@ class Chef file new_resource.name do owner new_resource.owner unless new_resource.owner.nil? group new_resource.group unless new_resource.group.nil? - mode new_resource.mode + mode new_resource.mode unless new_resource.mode.nil? content csr.to_pem action :create end file new_resource.key_file do - mode new_resource.mode 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? content key.to_pem sensitive true action :create_if_missing |