X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f66c502f7256ad38c308f8276542b6978a2545a6..32807af28e2d59cb4664f60eab1ab5111513cb77:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index fcbbe05af..db09f48f1 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -40,8 +40,8 @@ package "curl"
 package "m4"
 package "subversion"
 
-package "ruby"
-package "rubygems"
+package "ruby#{node[:passenger][:ruby_version]}"
+package "rubygems#{node[:passenger][:ruby_version]}"
 gem_package "json"
 gem_package "sqlite3"
 gem_package "sinatra"
@@ -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"
@@ -68,10 +69,18 @@ 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}"
   description = site[:description]
+  about = site[:about]
   icon = site[:icon]
   contact = site[:contact]
 
@@ -103,27 +112,36 @@ node[:taginfo][:sites].each do |site|
     group "taginfo"
   end
 
-  settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
-
-  settings["instance"]["url"] = "http://#{name}/"
-  settings["instance"]["description"] = description
-  settings["instance"]["icon"] = "/img/logo/#{icon}.png"
-  settings["instance"]["contact"] = contact
-  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"]["db"]["planetfile"] = "#{directory}/planet/planet.pbf"
-  settings["sources"]["db"]["tagstats"] = "#{directory}/taginfo/tagstats/tagstats"
-  settings["tagstats"]["cxxflags"] = "-I../../osmium/include"
-  settings["tagstats"]["geodistribution"] = "MmapAnon"
+  settings = Chef::DelayedEvaluator.new do
+    settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
+
+    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 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
 
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
     mode 0644
-    content JSON.pretty_generate(settings)
+    content settings
+    notifies :restart, "service[apache2]"
   end
 
   execute "#{directory}/taginfo/tagstats/Makefile" do
@@ -137,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
@@ -181,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"
@@ -206,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"