X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/77cd975164d60c089b6a42b2e9bd128c0e037025..77c76717bfc26fe7ba1641244164bc1cb5c38429:/cookbooks/ssl/resources/certificate.rb

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 92dbcc323..9d0ca7462 100644
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -19,78 +19,73 @@
 
 default_action :create
 
-property :name, String
-property :domains, Array, :required => true
-property :fallback_certificate, String
+property :certificate, String, :name_property => true
+property :domains, [String, Array], :required => true
 
 action :create do
-  node.default[:letsencrypt][:certificates][name] = {
-    :domains => domains
+  node.default[:letsencrypt][:certificates][certificate] = {
+    :domains => Array(domains)
   }
 
   if letsencrypt
-    certificate = letsencrypt["certificate"]
-    key = letsencrypt["key"]
+    certificate_content = letsencrypt["certificate"]
+    key_content = letsencrypt["key"]
   end
 
-  if certificate
-    file "/etc/ssl/certs/#{name}.pem" do
+  if certificate_content
+    file "/etc/ssl/certs/#{certificate}.pem" do
       owner "root"
       group "root"
       mode 0o444
-      content certificate
+      content certificate_content
       backup false
+      manage_symlink_source false
+      force_unlink true
     end
 
-    file "/etc/ssl/private/#{name}.key" do
+    file "/etc/ssl/private/#{certificate}.key" do
       owner "root"
       group "ssl-cert"
       mode 0o440
-      content key
+      content key_content
       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
+    template "/tmp/#{certificate}.ssl.cnf" do
       cookbook "ssl"
       source "ssl.cnf.erb"
       owner "root"
       group "root"
       mode 0o644
-      variables :domains => new_resource.domains
+      variables :domains => Array(domains)
       not_if do
-        ::File.exist?("/etc/ssl/certs/#{new_resource.name}.pem") && ::File.exist?("/etc/ssl/private/#{new_resource.name}.key")
+        ::File.exist?("/etc/ssl/certs/#{certificate}.pem") && ::File.exist?("/etc/ssl/private/#{certificate}.key")
       end
     end
 
-    execute "/etc/ssl/certs/#{name}.pem" do
-      command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/#{new_resource.name}.key -out /etc/ssl/certs/#{new_resource.name}.pem -days 365 -nodes -config /tmp/#{new_resource.name}.ssl.cnf"
+    execute "/etc/ssl/certs/#{certificate}.pem" do
+      command "openssl req -x509 -newkey rsa:2048 -keyout /etc/ssl/private/#{certificate}.key -out /etc/ssl/certs/#{certificate}.pem -days 365 -nodes -config /tmp/#{certificate}.ssl.cnf"
       user "root"
       group "ssl-cert"
       not_if do
-        ::File.exist?("/etc/ssl/certs/#{new_resource.name}.pem") && ::File.exist?("/etc/ssl/private/#{new_resource.name}.key")
+        ::File.exist?("/etc/ssl/certs/#{certificate}.pem") && ::File.exist?("/etc/ssl/private/#{certificate}.key")
       end
     end
   end
 end
 
 action :delete do
-  file "/etc/ssl/certs/#{name}.pem" do
+  file "/etc/ssl/certs/#{certificate}.pem" do
     action :delete
   end
 
-  file "/etc/ssl/private/#{name}.key" do
+  file "/etc/ssl/private/#{certificate}.key" do
     action :delete
   end
 end
 
 def letsencrypt
-  @letsencrypt ||= search(:letsencrypt, "id:#{name}").first
+  @letsencrypt ||= search(:letsencrypt, "id:#{certificate}").first
 end