Revert "Avoid installing aacraid-status on Ubuntu 22.04"

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

diff --git a/cookbooks/ssl/resources/certificate.rb b/cookbooks/ssl/resources/certificate.rb
index 7348a6726af6870818233368c501aabd2c5f8b07..f2fb4784c35219d6281d5ffb62f00d86c840c80e 100644 (file)
--- a/cookbooks/ssl/resources/certificate.rb
+++ b/cookbooks/ssl/resources/certificate.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: ssl
+# Cookbook:: ssl

 # Resource:: ssl_certificate
 #
 # Resource:: ssl_certificate
 #

-# Copyright 2017, OpenStreetMap Foundation
+# Copyright:: 2017, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,14 +17,16 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 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


@@ -36,7 +38,7 @@ action :create do
     file "/etc/ssl/certs/#{new_resource.certificate}.pem" do
       owner "root"
       group "root"
     file "/etc/ssl/certs/#{new_resource.certificate}.pem" do
       owner "root"
       group "root"

-      mode 0o444
+      mode "444"

       content certificate
       backup false
       manage_symlink_source false
       content certificate
       backup false
       manage_symlink_source false


@@ -46,26 +48,26 @@ action :create do
     file "/etc/ssl/private/#{new_resource.certificate}.key" do
       owner "root"
       group "ssl-cert"
     file "/etc/ssl/private/#{new_resource.certificate}.key" do
       owner "root"
       group "ssl-cert"

-      mode 0o440
+      mode "440"

       content key
       backup false
       manage_symlink_source false
       force_unlink true
     end
   else
       content key
       backup false
       manage_symlink_source false
       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"
       owner "root"
       group "ssl-cert"
 
     openssl_x509_certificate "/etc/ssl/certs/#{new_resource.certificate}.pem" do
       key_file "/etc/ssl/private/#{new_resource.certificate}.key"
       owner "root"
       group "ssl-cert"

-      mode 0o640
+      mode "640"

       org "OpenStreetMap"
       email "operations@osmfoundation.org"
       org "OpenStreetMap"
       email "operations@osmfoundation.org"

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

       subject_alt_name alt_names
       subject_alt_name alt_names

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

     end
   end
 end
     end
   end
 end


@@ -84,4 +86,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