X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/19aeb7bfffb852ab8be005c004b1ef8e555a5b77..22bfa5e6f8152e492f21ae2c972a164474cfdd61:/cookbooks/tilelog/recipes/default.rb diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 0916f6b60..56d7870f3 100644 --- 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, @@ -17,16 +17,18 @@ # limitations under the License. # +include_recipe "git" include_recipe "tools" package %w[ gcc + g++ make autoconf automake libboost-filesystem-dev - libboost-system-dev libboost-program-options-dev + libboost-system-dev ] tilelog_source_directory = node[:tilelog][:source_directory] @@ -40,7 +42,7 @@ git tilelog_source_directory do revision "live" user "root" group "root" - notifies :run, "execute[tilelog-autogen]", :immediate + notifies :run, "execute[tilelog-autogen]", :immediately end execute "tilelog-autogen" do @@ -49,7 +51,7 @@ execute "tilelog-autogen" do cwd tilelog_source_directory user "root" group "root" - notifies :run, "execute[tilelog-configure]", :immediate + notifies :run, "execute[tilelog-configure]", :immediately end execute "tilelog-configure" do @@ -58,7 +60,7 @@ execute "tilelog-configure" do cwd tilelog_source_directory user "root" group "root" - notifies :run, "execute[tilelog-build]", :immediate + notifies :run, "execute[tilelog-build]", :immediately end execute "tilelog-build" do @@ -93,4 +95,5 @@ directory tilelog_output_directory do user "www-data" group "www-data" mode 0o755 + recursive true end