Update wiki to mediawiki 1.28

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

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 42957c798f5e7a17ad8980c126ee92b05103ea6e..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] = {
@@ -41,6 +40,7 @@ action :create do
       content certificate
       backup false
       manage_symlink_source false
+      force_unlink true
     end
 
     file "/etc/ssl/private/#{name}.key" do
@@ -50,14 +50,7 @@ action :create do
       content key
       backup false
       manage_symlink_source 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"
+      force_unlink true
     end
   else
     template "/tmp/#{name}.ssl.cnf" do