Touch XML files to reflect date of original RRD file. Don't run dump in parallel...

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

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index 4bbcea471acb1cd8873f16723f24d57aaa0f4c6e..976db154b3fc5522ae77a8fbd970aa3507bcd9d0 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -18,28 +18,44 @@
 #
 
 keys = data_bag_item("ssl", "keys")
+certs = data_bag_item("ssl", "certs")
 
 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
 
-cookbook_file "/etc/ssl/certs/openstreetmap.pem" do
-  owner "root"
-  group "root"
-  mode 0444
-  backup false
-end
+["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
+  if node[:ssl][:certificates].include?(certificate)
+    file "/etc/ssl/certs/#{certificate}.pem" do
+      owner "root"
+      group "root"
+      mode 0o444
+      content certs[certificate].join("\n")
+      backup false
+    end
+
+    file "/etc/ssl/private/#{certificate}.key" do
+      owner "root"
+      group "ssl-cert"
+      mode 0o440
+      content keys[certificate].join("\n")
+      backup false
+    end
+  else
+    file "/etc/ssl/certs/#{certificate}.pem" do
+      action :delete
+    end
 
-file "/etc/ssl/private/openstreetmap.key" do
-  owner "root"
-  group "ssl-cert"
-  mode 0440
-  content keys["openstreetmap"].join("\n")
-  backup false
+    file "/etc/ssl/private/#{certificate}.key" do
+      action :delete
+    end
+  end
 end