Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index fd1bff0e4c13dc73d09e34280b8711e4529bd2bf..5fc33b61be6e8a992b048967fbc86f6c85755ae2 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -20,11 +20,11 @@
 default_action :create
 
 property :certificate, String, :name_property => true
 default_action :create
 
 property :certificate, String, :name_property => true

-property :domains, [String, Array], :required => true
+property :domains, [String, Array], :required => [:create]

 
 action :create do
   node.default[:letsencrypt][:certificates][new_resource.certificate] = {
 
 action :create do
   node.default[:letsencrypt][:certificates][new_resource.certificate] = {

-    :domains => Array(new_resource.domains)
+    :domains => domains

   }
 
   if letsencrypt
   }
 
   if letsencrypt


@@ -53,7 +53,7 @@ action :create do
       force_unlink true
     end
   else
       force_unlink true
     end
   else

-    alt_names = new_resource.domains.collect { |domain| "DNS:#{domain}" }
+    alt_names = domains.collect { |domain| "DNS:#{domain}" }

 
     openssl_x509_certificate "/etc/ssl/certs/#{new_resource.certificate}.pem" do
       key_file "/etc/ssl/private/#{new_resource.certificate}.key"
 
     openssl_x509_certificate "/etc/ssl/certs/#{new_resource.certificate}.pem" do
       key_file "/etc/ssl/private/#{new_resource.certificate}.key"


@@ -62,7 +62,7 @@ action :create do
       mode "640"
       org "OpenStreetMap"
       email "operations@osmfoundation.org"
       mode "640"
       org "OpenStreetMap"
       email "operations@osmfoundation.org"

-      common_name new_resource.domains.first
+      common_name domains.first

       subject_alt_name alt_names
       extensions "keyUsage" => { "values" => %w[digitalSignature keyEncipherment], "critical" => true },
                  "extendedKeyUsage" => { "values" => %w[serverAuth clientAuth], "critical" => true }
       subject_alt_name alt_names
       extensions "keyUsage" => { "values" => %w[digitalSignature keyEncipherment], "critical" => true },
                  "extendedKeyUsage" => { "values" => %w[serverAuth clientAuth], "critical" => true }


@@ -84,4 +84,8 @@ action_class do
   def letsencrypt
     @letsencrypt ||= search(:letsencrypt, "id:#{new_resource.certificate}").first
   end
   def letsencrypt
     @letsencrypt ||= search(:letsencrypt, "id:#{new_resource.certificate}").first
   end

+
+  def domains
+    Array(new_resource.domains)
+  end

 end
 end