X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/979e98164cc9a6d7216197f01febc918c9a152b9..a12bd631f0eed60f140864d7fbc1b61b54d17b43:/cookbooks/tilelog/recipes/default.rb diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 9deb70d0b..6fef30343 100644 --- 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" - 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 +63,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,19 +72,17 @@ 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 @@ -93,5 +91,5 @@ directory tilelog_output_directory do action :create user "www-data" group "www-data" - mode 0755 + mode 0o755 end