For style.

diff --git a/cookbooks/planet/attributes/default.rb b/cookbooks/planet/attributes/default.rb
index b6630d3b2116183c4911013361514e85b66ea49e..eba58b4fc84249faffc52e079718ba93e0b864c8 100644 (file)
--- 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 72eb15752d33eb20502edcdc5d2301a158a2a997..81597f3ef120aade0f9462444f762f96788ba5ed 100644 (file)
--- 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