diff options
Diffstat (limited to 'lib/chef/resource/openssl_dhparam.rb')
| -rw-r--r-- | lib/chef/resource/openssl_dhparam.rb | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/lib/chef/resource/openssl_dhparam.rb b/lib/chef/resource/openssl_dhparam.rb index b93ad81f55..05347ec494 100644 --- a/lib/chef/resource/openssl_dhparam.rb +++ b/lib/chef/resource/openssl_dhparam.rb @@ -57,28 +57,19 @@ class Chef action :create do description "Create the dhparam file." + dhparam_content = nil unless dhparam_pem_valid?(new_resource.path) - converge_by("Create a dhparam file #{new_resource.path}") do - dhparam_content = gen_dhparam(new_resource.key_length, new_resource.generator).to_pem - - file new_resource.path do - action :create - owner new_resource.owner unless new_resource.owner.nil? - group new_resource.group unless new_resource.group.nil? - mode new_resource.mode - sensitive true - content dhparam_content - end - end + dhparam_content = gen_dhparam(new_resource.key_length, new_resource.generator).to_pem + Chef::Log.debug("Valid dhparam content not found at #{new_resource.path}, creating new") end - if ::File.exist?(new_resource.path) - file new_resource.path do - action :create - owner new_resource.owner unless new_resource.owner.nil? - group new_resource.group unless new_resource.group.nil? - mode new_resource.mode - sensitive true - end + + file new_resource.path do + action :create + owner new_resource.owner + group new_resource.group + mode new_resource.mode + sensitive true + content dhparam_content end end end |