Require postgres 9.3 on poldi and pummelzacken

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

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index 9deb70d0b05b73252560fd05bfb1e2bea7814b1e..9ab433195e467b6f4bbf4d017bc2fce499b1fa0a 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -36,26 +36,26 @@ git tilelog_source_directory do
   action :sync
   repository "https://github.com/zerebubuth/openstreetmap-tile-analyze.git"
   revision "live"
   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
   notifies :run, "execute[tilelog-autogen]", :immediate
 end
 
 execute "tilelog-autogen" do
   action :nothing

-  command "./autogen.sh"
+  command "autoreconf -i"

   cwd tilelog_source_directory
   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
   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
   cwd tilelog_source_directory

-  user "www-data"
-  group "www-data"
+  user "root"
+  group "root"

   notifies :run, "execute[tilelog-build]", :immediate
 end
 
   notifies :run, "execute[tilelog-build]", :immediate
 end
 


@@ -63,8 +63,8 @@ execute "tilelog-build" do
   action :nothing
   command "make"
   cwd tilelog_source_directory
   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
 end
 
 # resources for running the tile analysis


@@ -73,15 +73,13 @@ template "/usr/local/bin/tilelog" do
   owner "root"
   group "root"
   mode 0755
   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
-  }
+  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
 end
 
 template "/etc/cron.d/tilelog" do

-  source "tileog.cron.erb"
+  source "tilelog.cron.erb"

   owner "root"
   group "root"
   mode 0644
   owner "root"
   group "root"
   mode 0644