From 69f995e284e8c0e46f1c5ee768c7edd064931f1b Mon Sep 17 00:00:00 2001 From: Matt Amos Date: Mon, 15 Dec 2014 20:32:37 +0000 Subject: [PATCH] For style. --- cookbooks/planet/attributes/default.rb | 7 +++---- cookbooks/planet/recipes/tilelog.rb | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cookbooks/planet/attributes/default.rb b/cookbooks/planet/attributes/default.rb index b6630d3b2..eba58b4fc 100644 --- a/cookbooks/planet/attributes/default.rb +++ b/cookbooks/planet/attributes/default.rb @@ -3,7 +3,6 @@ default[:planet][:dump][:xml_history_directory] = "/store/planet/planet/full-his default[:planet][:dump][:pbf_directory] = "/store/planet/pbf" default[:planet][:dump][:pbf_history_directory] = "/store/planet/pbf/full-history" -default[:planet][:tilelog_source_directory] = "/home/www-data/tilelog" -default[:planet][:tilelog_input_directory] = "/store/logs/tile.openstreetmap.org" -default[:planet][:tilelog_output_directory] = "/store/planet/tile_logs" - +default[:planet][:tilelog][:source_directory] = "/home/www-data/tilelog" +default[:planet][:tilelog][:input_directory] = "/store/logs/tile.openstreetmap.org" +default[:planet][:tilelog][:output_directory] = "/store/planet/tile_logs" diff --git a/cookbooks/planet/recipes/tilelog.rb b/cookbooks/planet/recipes/tilelog.rb index 72eb15752..81597f3ef 100644 --- a/cookbooks/planet/recipes/tilelog.rb +++ b/cookbooks/planet/recipes/tilelog.rb @@ -27,9 +27,9 @@ 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] # resources for building the tile analysis binary git tilelog_source_directory do -- 2.43.2