Update civicrm to 4.7.23

[chef.git] / cookbooks / ssl / resources / certificate.rb

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 01eedd80ca2dbb4c7dd3bb40bd73d2a9bf428a83..c133491edb28eb5ff0f10ca42c793e0b2cb6c4de 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -21,7 +21,6 @@ default_action :create
 
 property :name, String
 property :domains, [String, Array], :required => true
-property :fallback_certificate, String
 
 action :create do
   node.default[:letsencrypt][:certificates][name] = {
@@ -40,6 +39,8 @@ action :create do
       mode 0o444
       content certificate
       backup false
+      manage_symlink_source false
+      force_unlink true
     end
 
     file "/etc/ssl/private/#{name}.key" do
@@ -48,14 +49,8 @@ action :create do
       mode 0o440
       content key
       backup false
-    end
-  elsif fallback_certificate
-    link "/etc/ssl/certs/#{name}.pem" do
-      to "#{fallback_certificate}.pem"
-    end
-
-    link "/etc/ssl/private/#{name}.key" do
-      to "#{fallback_certificate}.key"
+      manage_symlink_source false
+      force_unlink true
     end
   else
     template "/tmp/#{name}.ssl.cnf" do