Pull sem-static-front wordpress plugin from local repository

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 453c19a7170057e39bd26fc21358aeec35e7ab74..d2f875611e6a9630890b820d3e3f3822ab14f384 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -194,7 +194,7 @@ 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"
+    group "tile"

     subscribes :run, resources(:execute => file), :immediately
   end
 
     subscribes :run, resources(:execute => file), :immediately
   end
 


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

+    backup false

     notifies :run, resources(:execute => file), :immediately
     notifies :restart, resources(:service => "renderd")
   end
     notifies :run, resources(:execute => file), :immediately
     notifies :restart, resources(:service => "renderd")
   end


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

-#file node[:tile][:node_file] do
-#  owner "tile"
-#  group "www-data"
-#  mode 0640
-#end
+tile_uid = node[:etc][:passwd]["tile"][:uid]
+www_data_gid = node[:etc][:group]["www-data"][:gid]
+
+ruby_block node[:tile][:node_file] do
+  block do
+    File.chown(tile_uid, www_data_gid, node[:tile][:node_file])
+    File.chmod(0640, node[:tile][:node_file])
+  end
+  not_if do
+    stat = File.stat(node[:tile][:node_file])
+    stat.uid == tile_uid && stat.gid == www_data_gid && stat.mode == 0640
+  end
+end

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


@@ -501,12 +510,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"