Tune apache on tile servers to avoid repeated up/down scaling

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

diff --git a/cookbooks/ssl/recipes/default.rb b/cookbooks/ssl/recipes/default.rb
index f737fe1a6356e596508e98ca7e25d717f73a5f30..976db154b3fc5522ae77a8fbd970aa3507bcd9d0 100644 (file)
--- a/cookbooks/ssl/recipes/default.rb
+++ b/cookbooks/ssl/recipes/default.rb
@@ -18,6 +18,7 @@
 #
 
 keys = data_bag_item("ssl", "keys")
 #
 
 keys = data_bag_item("ssl", "keys")

+certs = data_bag_item("ssl", "certs")

 
 package "openssl"
 package "ssl-cert"
 
 package "openssl"
 package "ssl-cert"


@@ -26,24 +27,25 @@ package "ssl-cert"
   cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
     owner "root"
     group "root"
   cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
     owner "root"
     group "root"

-    mode 0444
+    mode 0o444

     backup false
   end
 end
 
 ["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
   if node[:ssl][:certificates].include?(certificate)
     backup false
   end
 end
 
 ["openstreetmap", "tile.openstreetmap", "osmfoundation"].each do |certificate|
   if node[:ssl][:certificates].include?(certificate)

-    cookbook_file "/etc/ssl/certs/#{certificate}.pem" do
+    file "/etc/ssl/certs/#{certificate}.pem" do

       owner "root"
       group "root"
       owner "root"
       group "root"

-      mode 0444
+      mode 0o444
+      content certs[certificate].join("\n")

       backup false
     end
 
     file "/etc/ssl/private/#{certificate}.key" do
       owner "root"
       group "ssl-cert"
       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
       content keys[certificate].join("\n")
       backup false
     end