X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/392a811897ecd812f92b66b497a19bdc9d232984..f66c502f7256ad38c308f8276542b6978a2545a6:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index e0b6d34c2..fcbbe05af 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -37,6 +37,7 @@ package "g++" package "sqlite3" package "osmosis" package "curl" +package "m4" package "subversion" package "ruby" @@ -63,11 +64,8 @@ directory "/var/log/taginfo" do mode 0755 end -template "/etc/logrotate.d/taginfo" do - source "logrotate.erb" - owner "root" - group "root" - mode 0644 +file "/etc/logrotate.d/taginfo" do + action :delete end node[:taginfo][:sites].each do |site| @@ -119,6 +117,7 @@ node[:taginfo][:sites].each do |site| settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf" settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats" settings["tagstats"]["cxxflags"] = "-I../../osmium/include" + settings["tagstats"]["geodistribution"] = "MmapAnon" file "#{directory}/taginfo-config.json" do owner "taginfo" @@ -234,7 +233,7 @@ node[:taginfo][:sites].each do |site| owner "taginfo" group "taginfo" mode 0755 - variables :directory => directory + variables :name => name, :directory => directory end apache_site name do