nominatim: switch to full extratags style

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

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 9deb70d0b05b73252560fd05bfb1e2bea7814b1e..edc6e7e72e4def87898104c918ffdbb0dc84d021 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: tilelog
+# Cookbook:: tilelog
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,13 +19,15 @@
 
 include_recipe "tools"
 
-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libboost-filesystem-dev"
-package "libboost-system-dev"
-package "libboost-program-options-dev"
+package %w[
+  gcc
+  make
+  autoconf
+  automake
+  libboost-filesystem-dev
+  libboost-system-dev
+  libboost-program-options-dev
+]
 
 tilelog_source_directory = node[:tilelog][:source_directory]
 tilelog_input_directory = node[:tilelog][:input_directory]
@@ -36,26 +38,26 @@ git tilelog_source_directory do
   action :sync
   repository "https://github.com/zerebubuth/openstreetmap-tile-analyze.git"
   revision "live"
-  user "www-data"
-  group "www-data"
+  user "root"
+  group "root"
   notifies :run, "execute[tilelog-autogen]", :immediate
 end
 
 execute "tilelog-autogen" do
   action :nothing
-  command "./autogen.sh"
+  command "autoreconf -i"
   cwd tilelog_source_directory
-  user "www-data"
-  group "www-data"
+  user "root"
+  group "root"
   notifies :run, "execute[tilelog-configure]", :immediate
 end
 
 execute "tilelog-configure" do
   action :nothing
-  command "./configure --with-boost-libdir=/usr/lib"
+  command "./configure --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
   cwd tilelog_source_directory
-  user "www-data"
-  group "www-data"
+  user "root"
+  group "root"
   notifies :run, "execute[tilelog-build]", :immediate
 end
 
@@ -63,8 +65,8 @@ execute "tilelog-build" do
   action :nothing
   command "make"
   cwd tilelog_source_directory
-  user "www-data"
-  group "www-data"
+  user "root"
+  group "root"
 end
 
 # resources for running the tile analysis
@@ -72,26 +74,23 @@ template "/usr/local/bin/tilelog" do
   source "tilelog.erb"
   owner "root"
   group "root"
-  mode 0755
-  variables {
-    :analyze_bin => "#{tilelog_source_directory}/openstreetmap-tile-analyze",
-    :input_dir => tilelog_input_directory,
-    :output_dir => tilelog_output_directory
-  }
+  mode 0o755
+  variables :analyze_bin => "#{tilelog_source_directory}/openstreetmap-tile-analyze",
+            :input_dir => tilelog_input_directory,
+            :output_dir => tilelog_output_directory
 end
 
 template "/etc/cron.d/tilelog" do
-  source "tileog.cron.erb"
+  source "tilelog.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 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
+  mode 0o755
 end