Make an EditedFile look like a string

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index fbd8ef64d89c733263129cbdda63de93c4bdc008..19a475cd3103fefa9a1190c23d24cf5df7c52471 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -17,14 +17,18 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:ssl][:certificates] = node[:ssl][:certificates] | [ "tile.openstreetmap" ]
+
+include_recipe "ssl"

 include_recipe "squid"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 include_recipe "squid"
 
 tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 

-@tilecaches.each do |cache|
+tilecaches.each do |cache|

   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
     firewall_rule "accept-squid" do
       action :accept
   cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address|
     firewall_rule "accept-squid" do
       action :accept

+      family "inet"

       source "net:#{address}"
       dest "fw"
       proto "tcp:syn"
       source "net:#{address}"
       dest "fw"
       proto "tcp:syn"


@@ -33,6 +37,7 @@ tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
     end
     firewall_rule "accept-squid-icp" do
       action :accept
     end
     firewall_rule "accept-squid-icp" do
       action :accept

+      family "inet"

       source "net:#{address}"
       dest "fw"
       proto "udp"
       source "net:#{address}"
       dest "fw"
       proto "udp"


@@ -46,3 +51,11 @@ squid_fragment "tilecache" do
   template "squid.conf.erb"
   variables :caches => tilecaches
 end
   template "squid.conf.erb"
   variables :caches => tilecaches
 end

+
+template "/etc/logrotate.d/squid" do
+  source "logrotate.squid.erb"
+  owner "root"
+  group "root"
+  mode 0644
+end
+