X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/69a34d619e4d62d19cbed2f6562635279cc600bb..a19f9c4c8ce5cbc8b5b73d2d33de98bae686176b:/cookbooks/taginfo/recipes/default.rb diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb index 288f39a96..538341521 100644 --- a/cookbooks/taginfo/recipes/default.rb +++ b/cookbooks/taginfo/recipes/default.rb @@ -1,8 +1,8 @@ # -# 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. @@ -19,6 +19,7 @@ require "json" +include_recipe "accounts" include_recipe "apache" include_recipe "passenger" include_recipe "git" @@ -33,6 +34,8 @@ package %w[ libgd-dev libicu-dev libboost-program-options-dev + libosmium2-dev + libprotozero-dev cmake make g++ @@ -40,6 +43,8 @@ package %w[ package %w[ sqlite3 + sqlite3-pcre + osmium-tool pyosmium curl pbzip2 @@ -51,6 +56,7 @@ package "ruby#{ruby_version}" gem_package "bundler#{ruby_version}" do package_name "bundler" + version "~> 1.16.2" gem_binary "gem#{ruby_version}" options "--format-executable" end @@ -59,28 +65,17 @@ apache_module "cache" apache_module "cache_disk" apache_module "headers" -template "/etc/cron.d/taginfo" do - source "cron.erb" - owner "root" - group "root" - mode 0o644 -end - directory "/var/log/taginfo" do owner "taginfo" group "taginfo" - mode 0o755 -end - -file "/etc/logrotate.d/taginfo" do - action :delete + mode "755" end template "/etc/sudoers.d/taginfo" do source "sudoers.erb" owner "root" group "root" - mode 0o440 + mode "440" end node[:taginfo][:sites].each do |site| @@ -95,35 +90,47 @@ node[:taginfo][:sites].each do |site| directory "/var/log/taginfo/#{site_name}" do owner "taginfo" group "taginfo" - mode 0o755 + mode "755" end directory directory do owner "taginfo" group "taginfo" - mode 0o755 + mode "755" end - git "#{directory}/libosmium" do + git "#{directory}/taginfo-tools" do action :sync - repository "git://github.com/osmcode/libosmium.git" - revision "v2.12.1" + repository "https://github.com/taginfo/taginfo-tools.git" + revision "osmorg-taginfo-live" + depth 1 + enable_submodules true user "taginfo" group "taginfo" end - git "#{directory}/osmium-tool" do - action :sync - repository "git://github.com/osmcode/osmium-tool.git" - revision "v1.6.1" + directory "#{directory}/build" do + owner "taginfo" + group "taginfo" + mode "755" + end + + execute "compile_taginfo_tools" do + action :nothing user "taginfo" group "taginfo" + cwd "#{directory}/build" + command "cmake #{directory}/taginfo-tools -DCMAKE_BUILD_TYPE=Release && make" + subscribes :run, "apt_package[libprotozero-dev]" + subscribes :run, "apt_package[libosmium2-dev]" + subscribes :run, "git[#{directory}/taginfo-tools]" end git "#{directory}/taginfo" do action :sync - repository "git://github.com/taginfo/taginfo.git" + repository "https://github.com/taginfo/taginfo.git" revision "osmorg-taginfo-live" + depth 1 user "taginfo" group "taginfo" end @@ -140,11 +147,11 @@ node[:taginfo][:sites].each do |site| settings["logging"]["directory"] = "/var/log/taginfo/#{site_name}" settings["opensearch"]["shortname"] = "Taginfo" settings["opensearch"]["contact"] = "webmaster@openstreetmap.org" + settings["paths"]["bin_dir"] = "#{directory}/build/src" 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["tagstats"]["cxxflags"] = "-I../../libosmium/include" + settings["sources"]["create"] = "db languages projects wiki chronology" + settings["sources"]["db"]["planetfile"] = "/var/lib/planet/planet.osh.pbf" + settings["sources"]["chronology"]["osm_history_file"] = "/var/lib/planet/planet.osh.pbf" settings["tagstats"]["geodistribution"] = "DenseMmapArray" JSON.pretty_generate(settings) @@ -153,38 +160,11 @@ node[:taginfo][:sites].each do |site| file "#{directory}/taginfo-config.json" do owner "taginfo" group "taginfo" - mode 0o644 + mode "644" content settings notifies :restart, "service[apache2]" end - execute "#{directory}/taginfo/tagstats/Makefile" do - action :nothing - command "make" - cwd "#{directory}/taginfo/tagstats" - user "taginfo" - group "taginfo" - subscribes :run, "git[#{directory}/libosmium]" - subscribes :run, "git[#{directory}/taginfo]" - notifies :restart, "service[apache2]" - end - - directory "#{directory}/osmium-tool/build" do - owner "taginfo" - group "taginfo" - mode "0755" - end - - execute "compile-osmium" do - action :nothing - command "cmake .. && make" - cwd "#{directory}/osmium-tool/build" - user "taginfo" - group "taginfo" - subscribes :run, "git[#{directory}/libosmium]" - subscribes :run, "git[#{directory}/osmium-tool]" - end - execute "#{directory}/taginfo/Gemfile" do action :nothing command "bundle#{ruby_version} install" @@ -196,47 +176,25 @@ node[:taginfo][:sites].each do |site| notifies :restart, "passenger_application[#{directory}/taginfo/web/public]" end - %w[taginfo/web/tmp bin data data/old download sources planet planet/log].each do |dir| + %w[taginfo/web/tmp bin data data/old download sources].each do |dir| directory "#{directory}/#{dir}" do owner "taginfo" group "taginfo" - mode 0o755 + mode "755" end end - remote_file "#{directory}/planet/planet.pbf" do - action :create_if_missing - source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf" - owner "taginfo" - group "taginfo" - mode 0o644 - end - - template "#{directory}/bin/update-planet" do - source "update-planet.erb" - owner "taginfo" - group "taginfo" - mode 0o755 - variables :directory => directory - end - - template "#{directory}/bin/update-taginfo" do - source "update-taginfo.erb" - owner "taginfo" - group "taginfo" - mode 0o755 - variables :directory => directory - end - template "#{directory}/bin/update" do source "update.erb" owner "taginfo" group "taginfo" - mode 0o755 + mode "755" variables :name => site_name, :directory => directory end - passenger_application "#{directory}/taginfo/web/public" + passenger_application "#{directory}/taginfo/web/public" do + action :nothing + end ssl_certificate site_name do domains [site_name] + site_aliases @@ -249,3 +207,11 @@ node[:taginfo][:sites].each do |site| variables :aliases => site_aliases end end + +template "/usr/local/bin/taginfo-update" do + source "taginfo-update.erb" + owner "root" + group "root" + mode "755" + variables :sites => node[:taginfo][:sites] +end