X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/b93b9fd8dd947cf8da70ef063b068a7b336d460a..69f995e284e8c0e46f1c5ee768c7edd064931f1b:/cookbooks/planet/recipes/tilelog.rb

diff --git a/cookbooks/planet/recipes/tilelog.rb b/cookbooks/planet/recipes/tilelog.rb
index 56023d62e..81597f3ef 100644
--- a/cookbooks/planet/recipes/tilelog.rb
+++ b/cookbooks/planet/recipes/tilelog.rb
@@ -27,23 +27,27 @@ package "libboost-filesystem-dev"
 package "libboost-system-dev"
 package "libboost-program-options-dev"
 
-tilelog_source_directory = node[:planet][:tilelog_source_directory]
-tilelog_input_directory = node[:planet][:tilelog_input_directory]
-tilelog_output_directory = node[:planet][:tilelog_output_directory]
+tilelog_source_directory = node[:planet][:tilelog][:source_directory]
+tilelog_input_directory = node[:planet][:tilelog][:input_directory]
+tilelog_output_directory = node[:planet][:tilelog][:output_directory]
 
-directory tilelog_output_directory do
-  action :create
+# resources for building the tile analysis binary
+git tilelog_source_directory do
+  action :sync
+  repository "https://github.com/zerebubuth/openstreetmap-tile-analyze.git"
+  revision "HEAD"
   user "www-data"
   group "www-data"
-  mode 0755
+  notifies :run, "execute[tilelog-autogen]", :immediate
 end
 
-execute "tilelog-build" do
+execute "tilelog-autogen" do
   action :nothing
-  command "make"
+  command "./autogen.sh"
   cwd tilelog_source_directory
   user "www-data"
   group "www-data"
+  notifies :run, "execute[tilelog-configure]", :immediate
 end
 
 execute "tilelog-configure" do
@@ -55,24 +59,15 @@ execute "tilelog-configure" do
   notifies :run, "execute[tilelog-build]", :immediate
 end
 
-execute "tilelog-autogen" do
+execute "tilelog-build" do
   action :nothing
-  command "./autogen.sh"
+  command "make"
   cwd tilelog_source_directory
   user "www-data"
   group "www-data"
-  notifies :run, "execute[tilelog-configure]", :immediate
-end
-
-git tilelog_source_directory do
-  action :sync
-  repository "https://github.com/zerebubuth/openstreetmap-tile-analyze.git"
-  revision "HEAD"
-  user "www-data"
-  group "www-data"
-  notifies :run, "execute[tilelog-autogen]", :immediate
 end
 
+# resources for running the tile analysis
 template "/usr/local/bin/tilelog" do
   source "tilelog.erb"
   owner "root"
@@ -91,3 +86,12 @@ template "/etc/cron.d/tilelog" do
   group "root"
   mode 0644
 end
+
+# resources related to the output of the analysis and where it
+# can be publicly downloaded.
+directory tilelog_output_directory do
+  action :create
+  user "www-data"
+  group "www-data"
+  mode 0755
+end