#
-# 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,
require "json"
+include_recipe "accounts"
include_recipe "apache"
include_recipe "passenger"
include_recipe "git"
libboost-dev
libexpat1-dev
libsparsehash-dev
- libgd2-xpm-dev
+ libgd-dev
libicu-dev
libboost-program-options-dev
+ libosmium2-dev
+ libprotozero-dev
cmake
make
g++
package %w[
sqlite3
- osmosis
+ osmium-tool
+ pyosmium
curl
pbzip2
]
package "ruby#{ruby_version}"
-%w[json sqlite3 sinatra sinatra-r18n rack-contrib].each do |gem|
- gem_package gem do
- gem_binary "gem#{ruby_version}"
- end
+gem_package "bundler#{ruby_version}" do
+ package_name "bundler"
+ version "~> 1.16.2"
+ gem_binary "gem#{ruby_version}"
+ options "--format-executable"
end
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|
site_name = site[:name]
+ site_aliases = Array(site[:aliases])
directory = site[:directory] || "/srv/#{site_name}"
description = site[:description]
about = site[:about]
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
- end
-
- git "#{directory}/libosmium" do
- action :sync
- repository "git://github.com/osmcode/libosmium.git"
- revision "v2.12.1"
- user "taginfo"
- group "taginfo"
- end
-
- git "#{directory}/osmium-tool" do
- action :sync
- repository "git://github.com/osmcode/osmium-tool.git"
- revision "v1.6.1"
- user "taginfo"
- group "taginfo"
+ mode "755"
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
settings = Chef::DelayedEvaluator.new do
settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
- settings["instance"]["url"] = "http://#{site_name}/"
+ settings["instance"]["url"] = "https://#{site_name}/"
settings["instance"]["description"] = description
settings["instance"]["about"] = about
settings["instance"]["icon"] = "/img/logo/#{icon}.png"
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"]["planetfile"] = "/var/lib/planet/planet.pbf"
settings["sources"]["db"]["bindir"] = "#{directory}/taginfo/tagstats"
- settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
settings["tagstats"]["geodistribution"] = "DenseMmapArray"
JSON.pretty_generate(settings)
file "#{directory}/taginfo-config.json" do
owner "taginfo"
group "taginfo"
- mode 0o644
+ mode "644"
content settings
notifies :restart, "service[apache2]"
end
cwd "#{directory}/taginfo/tagstats"
user "taginfo"
group "taginfo"
- subscribes :run, "git[#{directory}/libosmium]"
+ subscribes :run, "apt_package[libprotozero-dev]"
+ subscribes :run, "apt_package[libosmium2-dev]"
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
+ execute "#{directory}/taginfo/Gemfile" 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]"
+ 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 planet planet/log planet/replication].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 "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
- owner "taginfo"
- group "taginfo"
- mode 0o644
- end
-
- template "#{directory}/planet/replication/configuration.txt" do
- source "configuration.txt.erb"
- owner "taginfo"
- group "taginfo"
- mode 0o644
- end
-
- file "#{directory}/planet/replication/download.lock" do
- 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" do
+ action :nothing
+ end
+
ssl_certificate site_name do
- domains site_name
+ 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 "755"
+ variables :sites => node[:taginfo][:sites]
+end
projects / chef.git / blobdiff