Drop prefork overrides for PHP sites

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

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 6fef30343622a2c1112599d6c271e9d9c1c988a7..56d7870f3c6b60ad5929a71b543ce4cc6577ab62 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
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,15 +17,19 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "git"

 include_recipe "tools"
 
 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
+  g++
+  make
+  autoconf
+  automake
+  libboost-filesystem-dev
+  libboost-program-options-dev
+  libboost-system-dev
+]

 
 tilelog_source_directory = node[:tilelog][:source_directory]
 tilelog_input_directory = node[:tilelog][:input_directory]
 
 tilelog_source_directory = node[:tilelog][:source_directory]
 tilelog_input_directory = node[:tilelog][:input_directory]


@@ -38,7 +42,7 @@ git tilelog_source_directory do
   revision "live"
   user "root"
   group "root"
   revision "live"
   user "root"
   group "root"

-  notifies :run, "execute[tilelog-autogen]", :immediate
+  notifies :run, "execute[tilelog-autogen]", :immediately

 end
 
 execute "tilelog-autogen" do
 end
 
 execute "tilelog-autogen" do


@@ -47,7 +51,7 @@ execute "tilelog-autogen" do
   cwd tilelog_source_directory
   user "root"
   group "root"
   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
 end
 
 execute "tilelog-configure" do


@@ -56,7 +60,7 @@ execute "tilelog-configure" do
   cwd tilelog_source_directory
   user "root"
   group "root"
   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
 end
 
 execute "tilelog-build" do


@@ -88,8 +92,8 @@ end
 # resources related to the output of the analysis and where it
 # can be publicly downloaded.
 directory tilelog_output_directory do
 # 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 0o755
   user "www-data"
   group "www-data"
   mode 0o755

+  recursive true

 end
 end