X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f66c502f7256ad38c308f8276542b6978a2545a6..1bd8163c228324ae78795aed98f5d34beab7fc6a:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index fcbbe05af..6c0062f99 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -49,7 +49,8 @@ gem_package "sinatra-r18n" gem_package "rack-contrib" apache_module "cache" -apache_module "disk_cache" +apache_module "cache_disk" +apache_module "headers" template "/etc/cron.d/taginfo" do source "cron.erb" @@ -72,6 +73,7 @@ node[:taginfo][:sites].each do |site| name = site[:name] directory = site[:directory] || "/srv/#{name}" description = site[:description] + about = site[:about] icon = site[:icon] contact = site[:contact] @@ -107,13 +109,15 @@ node[:taginfo][:sites].each do |site| settings["instance"]["url"] = "http://#{name}/" settings["instance"]["description"] = description + settings["instance"]["about"] = about settings["instance"]["icon"] = "/img/logo/#{icon}.png" settings["instance"]["contact"] = contact + settings["instance"]["access_control_allow_origin"] = "" settings["logging"]["directory"] = "/var/log/taginfo/#{name}" settings["opensearch"]["shortname"] = "Taginfo" settings["opensearch"]["contact"] = "webmaster@openstreetmap.org" - settings["sources"]["download"] = "" - settings["sources"]["create"] = "db languages josm potlatch wiki" + settings["sources"]["download"] = "josm" + settings["sources"]["create"] = "db languages potlatch projects wiki" settings["sources"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf" settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats" settings["tagstats"]["cxxflags"] = "-I../../osmium/include"