# 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 "apache::ssl"
+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 "osmosis"
-package "curl"
-package "m4"
-package "subversion"
-
-package "ruby#{node[:passenger][:ruby_version]}"
-package "rubygems#{node[:passenger][:ruby_version]}"
-gem_package "json"
-gem_package "sqlite3"
-gem_package "sinatra"
-gem_package "sinatra-r18n"
-gem_package "rack-contrib"
+package %w[
+ libsqlite3-dev
+ zlib1g-dev
+ libbz2-dev
+ libboost-dev
+ libexpat1-dev
+ libsparsehash-dev
+ libgd-dev
+ libicu-dev
+ libboost-program-options-dev
+ cmake
+ make
+ g++
+]
+
+package %w[
+ sqlite3
+ osmosis
+ curl
+ pbzip2
+]
+
+ruby_version = node[:passenger][:ruby_version]
+
+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
+end
apache_module "cache"
apache_module "cache_disk"
source "cron.erb"
owner "root"
group "root"
- mode 0644
+ mode 0o644
end
directory "/var/log/taginfo" do
owner "taginfo"
group "taginfo"
- mode 0755
+ mode 0o755
end
file "/etc/logrotate.d/taginfo" do
action :delete
end
+template "/etc/sudoers.d/taginfo" do
+ source "sudoers.erb"
+ owner "root"
+ group "root"
+ mode 0o440
+end
+
node[:taginfo][:sites].each do |site|
- name = site[:name]
- directory = site[:directory] || "/srv/#{name}"
+ 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/#{name}" do
+ directory "/var/log/taginfo/#{site_name}" do
owner "taginfo"
group "taginfo"
- mode 0755
+ mode 0o755
end
directory directory do
owner "taginfo"
group "taginfo"
- mode 0755
+ mode 0o755
end
- git "#{directory}/osmium" do
+ git "#{directory}/libosmium" do
action :sync
- repository "git://github.com/joto/osmium.git"
- revision "osmorg-taginfo-live"
+ 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"
end
git "#{directory}/taginfo" do
action :sync
- repository "git://github.com/joto/taginfo.git"
+ repository "git://github.com/taginfo/taginfo.git"
revision "osmorg-taginfo-live"
user "taginfo"
group "taginfo"
settings = Chef::DelayedEvaluator.new do
settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
- settings["instance"]["url"] = "http://#{name}/"
+ 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/#{name}"
+ settings["logging"]["directory"] = "/var/log/taginfo/#{site_name}"
settings["opensearch"]["shortname"] = "Taginfo"
settings["opensearch"]["contact"] = "webmaster@openstreetmap.org"
- settings["sources"]["download"] = "josm"
- settings["sources"]["create"] = "db languages potlatch projects wiki"
+ 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
+ settings["tagstats"]["cxxflags"] = "-I../../libosmium/include"
+ 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
cwd "#{directory}/taginfo/tagstats"
user "taginfo"
group "taginfo"
- subscribes :run, "git[#{directory}/osmium]"
+ subscribes :run, "git[#{directory}/libosmium]"
subscribes :run, "git[#{directory}/taginfo]"
notifies :restart, "service[apache2]"
end
- %w(taginfo/web/tmp bin data data/old download sources planet planet/log planet/replication).each do |dir|
+ 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
+
+ %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
+ mode 0o755
end
end
remote_file "#{directory}/planet/planet.pbf" do
action :create_if_missing
- source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
+ source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
owner "taginfo"
group "taginfo"
- mode 0644
+ mode 0o644
end
template "#{directory}/planet/replication/configuration.txt" do
source "configuration.txt.erb"
owner "taginfo"
group "taginfo"
- mode 0644
+ mode 0o644
end
file "#{directory}/planet/replication/download.lock" do
owner "taginfo"
group "taginfo"
- mode 0644
+ mode 0o644
end
template "#{directory}/bin/update-planet" do
source "update-planet.erb"
owner "taginfo"
group "taginfo"
- mode 0755
+ mode 0o755
variables :directory => directory
end
source "update-taginfo.erb"
owner "taginfo"
group "taginfo"
- mode 0755
+ mode 0o755
variables :directory => directory
end
source "update.erb"
owner "taginfo"
group "taginfo"
- mode 0755
- variables :name => name, :directory => directory
+ mode 0o755
+ variables :name => site_name, :directory => directory
+ end
+
+ ssl_certificate site_name do
+ domains [site_name] + site_aliases
+ notifies :reload, "service[apache2]"
end
- apache_site name do
+ apache_site site_name do
template "apache.erb"
directory "#{directory}/taginfo/web/public"
+ variables :aliases => site_aliases
end
end
projects / chef.git / blobdiff