From f23133043e6af564e52959d932eb2badfbedb538 Mon Sep 17 00:00:00 2001 From: Matt Amos Date: Mon, 15 Dec 2014 20:31:16 +0000 Subject: [PATCH] Re-ordering resources for better readability. --- cookbooks/planet/recipes/tilelog.rb | 38 ++++++++++++++++------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/cookbooks/planet/recipes/tilelog.rb b/cookbooks/planet/recipes/tilelog.rb index 56023d62e..72eb15752 100644 --- a/cookbooks/planet/recipes/tilelog.rb +++ b/cookbooks/planet/recipes/tilelog.rb @@ -31,19 +31,23 @@ 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 -- 2.43.2