X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a103860b1a9a10d37f6fdff5ede15bbb849ed2a5..a2acafbf65962eaf76f8d293a8942284a6891a9d:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index f1d5bb869..db09f48f1 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -69,6 +69,13 @@ file "/etc/logrotate.d/taginfo" do action :delete end +template "/etc/sudoers.d/taginfo" do + source "sudoers.erb" + owner "root" + group "root" + mode 0440 +end + node[:taginfo][:sites].each do |site| name = site[:name] directory = site[:directory] || "/srv/#{name}" @@ -117,12 +124,14 @@ node[:taginfo][:sites].each do |site| settings["logging"]["directory"] = "/var/log/taginfo/#{name}" settings["opensearch"]["shortname"] = "Taginfo" settings["opensearch"]["contact"] = "webmaster@openstreetmap.org" - settings["sources"]["download"] = "josm" - settings["sources"]["create"] = "db languages potlatch projects wiki" + settings["sources"]["download"] = "" + settings["sources"]["create"] = "db languages projects wiki" settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf" + settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats" settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats" settings["tagstats"]["cxxflags"] = "-I../../osmium/include" settings["tagstats"]["geodistribution"] = "MmapAnon" + settings["user_interface"]["key_page"]["show_tab_similar"] = true JSON.pretty_generate(settings) end @@ -132,6 +141,7 @@ node[:taginfo][:sites].each do |site| group "taginfo" mode 0644 content settings + notifies :restart, "service[apache2]" end execute "#{directory}/taginfo/tagstats/Makefile" do @@ -145,40 +155,12 @@ node[:taginfo][:sites].each do |site| notifies :restart, "service[apache2]" end - directory "#{directory}/taginfo/web/tmp" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/data" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/data/old" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/download" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/sources" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/planet" do - owner "taginfo" - group "taginfo" - mode 0755 + %w(taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication).each do |dir| + directory "#{directory}/#{dir}" do + owner "taginfo" + group "taginfo" + mode 0755 + end end remote_file "#{directory}/planet/planet.pbf" do @@ -189,18 +171,6 @@ node[:taginfo][:sites].each do |site| mode 0644 end - directory "#{directory}/planet/log" do - owner "taginfo" - group "taginfo" - mode 0755 - end - - directory "#{directory}/planet/replication" do - owner "taginfo" - group "taginfo" - mode 0755 - end - template "#{directory}/planet/replication/configuration.txt" do source "configuration.txt.erb" owner "taginfo" @@ -214,12 +184,6 @@ node[:taginfo][:sites].each do |site| mode 0644 end - directory "#{directory}/bin" do - owner "taginfo" - group "taginfo" - mode 0755 - end - template "#{directory}/bin/update-planet" do source "update-planet.erb" owner "taginfo"