Ignore .kitchen.local.yml

[chef.git] / cookbooks / ssl / recipes / default.rb

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index c2e62d2288659f1adef5ab132ce5e2cdccdef5e5..33c9bcb14a657e196a496f27023b2ea8aaf82d13 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -22,26 +22,28 @@ keys = data_bag_item("ssl", "keys")
 package "openssl"
 package "ssl-cert"
 
-cookbook_file "/etc/ssl/certs/rapidssl.pem" do
-  owner "root"
-  group "root"
-  mode 0444
-  backup false
+%w(rapidssl startcom dhparam).each do |certificate|
+  cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
+    owner "root"
+    group "root"
+    mode 0o444
+    backup false
+  end
 end
 
-["openstreetmap", "tile.openstreetmap", "crm.osmfoundation"].each do |certificate|
+["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
   if node[:ssl][:certificates].include?(certificate)
     cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
       owner "root"
       group "root"
-      mode 0444
+      mode 0o444
       backup false
     end
 
     file "/etc/ssl/private/#{certificate}.key" do
       owner "root"
       group "ssl-cert"
-      mode 0440
+      mode 0o440
       content keys[certificate].join("\n")
       backup false
     end