X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6ed30a3d11d87fbec3d4ecef4c14b0f8ed707216..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/taginfo/recipes/default.rb

diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index ea329a57b..4289c0042 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: taginfo
+# Cookbook:: taginfo
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,74 +17,120 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+require "json"
+
+include_recipe "apache"
+include_recipe "passenger"
 include_recipe "git"
 
-package "libsqlite3-dev"
-package "zlib1g-dev"
-package "libosmpbf-dev"
-package "libprotobuf-dev"
-package "libboost-dev"
-package "libexpat1-dev"
-package "libsparsehash-dev"
-package "libgd2-xpm-dev"
-package "make"
-package "g++"
-
-package "sqlite3"
-
-package "ruby"
-package "rubygems"
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
-
-apache_module "passenger"
-
-munin_plugin "passenger_memory"
-munin_plugin "passenger_processes"
-munin_plugin "passenger_queues"
-munin_plugin "passenger_requests"
+package %w[
+  libsqlite3-dev
+  zlib1g-dev
+  libbz2-dev
+  libboost-dev
+  libexpat1-dev
+  libsparsehash-dev
+  libgd-dev
+  libicu-dev
+  libboost-program-options-dev
+  libosmium2-dev
+  libprotozero-dev
+  cmake
+  make
+  g++
+]
+
+package %w[
+  sqlite3
+  osmium-tool
+  pyosmium
+  curl
+  pbzip2
+]
+
+ruby_version = node[:passenger][:ruby_version]
+
+package "ruby#{ruby_version}"
+
+gem_package "bundler#{ruby_version}" do
+  package_name "bundler"
+  gem_binary "gem#{ruby_version}"
+  options "--format-executable"
+end
 
-node[:taginfo][:sites].each do |site|
-  name = site[:name]
-  directory = site[:directory] || "/srv/#{name}"
+apache_module "cache"
+apache_module "cache_disk"
+apache_module "headers"
 
-  directory directory do
+directory "/var/log/taginfo" do
+  owner "taginfo"
+  group "taginfo"
+  mode 0o755
+end
+
+template "/etc/sudoers.d/taginfo" do
+  source "sudoers.erb"
+  owner "root"
+  group "root"
+  mode 0o440
+end
+
+node[:taginfo][:sites].each do |site|
+  site_name = site[:name]
+  site_aliases = Array(site[:aliases])
+  directory = site[:directory] || "/srv/#{site_name}"
+  description = site[:description]
+  about = site[:about]
+  icon = site[:icon]
+  contact = site[:contact]
+
+  directory "/var/log/taginfo/#{site_name}" do
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
   end
 
-  git "#{directory}/osmium" do
-    action :sync
-    repository "git://github.com/joto/osmium.git"
-    revision "master"
-    user "taginfo"
+  directory directory do
+    owner "taginfo"
     group "taginfo"
+    mode 0o755
   end
 
   git "#{directory}/taginfo" do
     action :sync
-    repository "git://github.com/joto/taginfo.git"
-    revision "master"
+    repository "git://github.com/taginfo/taginfo.git"
+    revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
   end
 
-  settings = edit_file "#{directory}/taginfo/taginfo-config-example.json" do |line|
-    line.gsub!(/^( *)"cxxflags": ".*",/, "\\1\"cxxflags\": \"-I../../osmium/include\",")
-
-    line
+  settings = Chef::DelayedEvaluator.new do
+    settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
+
+    settings["instance"]["url"] = "https://#{site_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/#{site_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"] = "/var/lib/planet/planet.pbf"
+    settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
+    settings["tagstats"]["geodistribution"] = "DenseMmapArray"
+
+    JSON.pretty_generate(settings)
   end
 
   file "#{directory}/taginfo-config.json" do
     owner "taginfo"
     group "taginfo"
-    mode 0644
+    mode 0o644
     content settings
+    notifies :restart, "service[apache2]"
   end
 
   execute "#{directory}/taginfo/tagstats/Makefile" do
@@ -93,19 +139,59 @@ node[:taginfo][:sites].each do |site|
     cwd "#{directory}/taginfo/tagstats"
     user "taginfo"
     group "taginfo"
-    subscribes :run, "git[#{directory}/osmium]"
+    subscribes :run, "apt_package[libprotozero-dev]"
+    subscribes :run, "apt_package[libosmium2-dev]"
     subscribes :run, "git[#{directory}/taginfo]"
     notifies :restart, "service[apache2]"
   end
 
-  directory "#{directory}/data" do
+  execute "#{directory}/taginfo/Gemfile" do
+    action :nothing
+    command "bundle#{ruby_version} install"
+    cwd "#{directory}/taginfo"
+    user "root"
+    group "root"
+    subscribes :run, "gem_package[bundler#{ruby_version}]"
+    subscribes :run, "git[#{directory}/taginfo]"
+    notifies :restart, "passenger_application[#{directory}/taginfo/web/public]"
+  end
+
+  %w[taginfo/web/tmp bin data data/old download sources].each do |dir|
+    directory "#{directory}/#{dir}" do
+      owner "taginfo"
+      group "taginfo"
+      mode 0o755
+    end
+  end
+
+  template "#{directory}/bin/update" do
+    source "update.erb"
     owner "taginfo"
     group "taginfo"
-    mode 0755
+    mode 0o755
+    variables :name => site_name, :directory => directory
   end
 
-  apache_site name do
+  passenger_application "#{directory}/taginfo/web/public" do
+    action :nothing
+  end
+
+  ssl_certificate site_name do
+    domains [site_name] + site_aliases
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site site_name do
     template "apache.erb"
     directory "#{directory}/taginfo/web/public"
+    variables :aliases => site_aliases
   end
 end
+
+template "/usr/local/bin/taginfo-update" do
+  source "taginfo-update.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+  variables :sites => node[:taginfo][:sites]
+end