Whitelist SoTM-US 2014 Hack day tile access

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index cd88e91ceb3c779b81c2be54c7bb809f5c292ae2..d0769d2fd79fc3b007d951a45fe827786c9ea149 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -77,8 +77,8 @@ template "/etc/renderd.conf" do
   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644

-  notifies :reload, resources(:service => "apache2")
-  notifies :restart, resources(:service => "renderd")
+  notifies :reload, "service[apache2]"
+  notifies :restart, "service[renderd]"

 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do
 end
 
 remote_directory "/srv/tile.openstreetmap.org/html" do


@@ -100,6 +100,12 @@ end
 
 package "python-cairo"
 package "python-mapnik"
 
 package "python-cairo"
 package "python-mapnik"

+package "ttf-dejavu"
+package "ttf-unifont"
+package "fonts-droid"
+package "fonts-sipa-arundina"
+package "fonts-sil-padauk"
+package "fonts-khmeros"

 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"


@@ -169,7 +175,7 @@ node[:tile][:data].each do |name,data|
 
     execute file do
       action :nothing
 
     execute file do
       action :nothing

-      command "unzip -qq #{file} -d #{directory}"
+      command "unzip -qq -o #{file} -d #{directory}"

       user "tile"
       group "tile"
     end
       user "tile"
       group "tile"
     end


@@ -186,7 +192,7 @@ node[:tile][:data].each do |name,data|
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"
       command "ogr2ogr #{processed} #{original}"
       user "tile"
       group "tile"

-      subscribes :run, resources(:execute => file), :immediately
+      subscribes :run, "execute[#{file}]", :immediately

     end
   end
 
     end
   end
 


@@ -194,8 +200,8 @@ node[:tile][:data].each do |name,data|
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
     user "tile"
     action :nothing
     command "find #{directory} -type f -iname '*.shp' -print0 | xargs -0 --no-run-if-empty shapeindex --shape_files"
     user "tile"

-    user "tile"
-    subscribes :run, resources(:execute => file), :immediately
+    group "tile"
+    subscribes :run, "execute[#{file}]", :immediately

   end
 
   remote_file file do
   end
 
   remote_file file do


@@ -210,8 +216,9 @@ node[:tile][:data].each do |name,data|
     owner "tile"
     group "tile"
     mode 0644
     owner "tile"
     group "tile"
     mode 0644

-    notifies :run, resources(:execute => file), :immediately
-    notifies :restart, resources(:service => "renderd")
+    backup false
+    notifies :run, "execute[#{file}]", :immediately
+    notifies :restart, "service[renderd]"

   end
 end
 
   end
 end
 


@@ -256,8 +263,14 @@ node[:tile][:styles].each do |name,details|
   end
 
   details[:tile_directories].each do |directory|
   end
 
   details[:tile_directories].each do |directory|

+    directory directory[:name] do
+      owner "www-data"
+      group "www-data"
+      mode 0755
+    end
+

     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|
     directory[:min_zoom].upto(directory[:max_zoom]) do |zoom|

-      directory  "#{directory[:name]}/#{zoom}" do
+      directory "#{directory[:name]}/#{zoom}" do

         owner "www-data"
         group "www-data"
         mode 0755
         owner "www-data"
         group "www-data"
         mode 0755


@@ -367,11 +380,11 @@ postgresql_munin "gis" do
   database "gis"
 end
 
   database "gis"
 end
 

-#file node[:tile][:node_file] do
-#  owner "tile"
-#  group "www-data"
-#  mode 0640
-#end
+file node[:tile][:node_file] do
+  owner "tile"
+  group "www-data"
+  mode 0640
+end

 
 directory "/var/log/tile" do
   owner "tile"
 
 directory "/var/log/tile" do
   owner "tile"


@@ -446,8 +459,8 @@ end
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true
 service "replicate" do
   action [ :enable, :start ]
   supports :restart => true

-  subscribes :restart, resources(:template => "/usr/local/bin/replicate")
-  subscribes :restart, resources(:template => "/etc/init.d/replicate")
+  subscribes :restart, "template[/usr/local/bin/replicate]"
+  subscribes :restart, "template[/etc/init.d/replicate]"

 end
 
 template "/etc/logrotate.d/replicate" do
 end
 
 template "/etc/logrotate.d/replicate" do


@@ -479,6 +492,7 @@ template "/etc/rsyslog.d/20-renderd.conf" do
   notifies :restart, "service[rsyslog]"
 end
 
   notifies :restart, "service[rsyslog]"
 end
 

+package "liblockfile-simple-perl"

 package "libfilesys-df-perl"
 
 template "/usr/local/bin/cleanup-tiles" do
 package "libfilesys-df-perl"
 
 template "/usr/local/bin/cleanup-tiles" do


@@ -501,12 +515,13 @@ template "/etc/cron.d/cleanup-tiles" do
 end
 
 munin_plugin "mod_tile_fresh"
 end
 
 munin_plugin "mod_tile_fresh"

+munin_plugin "mod_tile_latency"

 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"
 munin_plugin "mod_tile_response"
 munin_plugin "mod_tile_zoom"

-munin_plugin "mod_tile_latency"

 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"
 
 munin_plugin "renderd_processed"
 munin_plugin "renderd_queue"

+munin_plugin "renderd_queue_time"

 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"
 
 munin_plugin "renderd_zoom"
 munin_plugin "renderd_zoom_time"