Remove legacy certificate support

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

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 92dbcc32347655f11479d657db2fa1f8b33811c6..c133491edb28eb5ff0f10ca42c793e0b2cb6c4de 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -20,12 +20,11 @@
 default_action :create
 
 property :name, String
-property :domains, Array, :required => true
-property :fallback_certificate, String
+property :domains, [String, Array], :required => true
 
 action :create do
   node.default[:letsencrypt][:certificates][name] = {
-    :domains => domains
+    :domains => Array(domains)
   }
 
   if letsencrypt
@@ -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
@@ -64,7 +59,7 @@ action :create do
       owner "root"
       group "root"
       mode 0o644
-      variables :domains => new_resource.domains
+      variables :domains => Array(new_resource.domains)
       not_if do
         ::File.exist?("/etc/ssl/certs/#{new_resource.name}.pem") && ::File.exist?("/etc/ssl/private/#{new_resource.name}.key")
       end