# 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,
include_recipe "git"
include_recipe "nodejs"
include_recipe "postgresql"
+include_recipe "python"
include_recipe "tools"
blocks = data_bag_item("tile", "blocks")
+web_passwords = data_bag_item("web", "passwords")
apache_module "alias"
apache_module "cgi"
conf "tile.conf.erb"
end
+ssl_certificate node[:fqdn] do
+ domains [node[:fqdn], "tile.openstreetmap.org", "render.openstreetmap.org"]
+ notifies :reload, "service[apache2]"
+end
+
tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
apache_site "default" do
private_network true
protect_system "full"
protect_home true
+ no_new_privileges true
restart "on-failure"
end
service "renderd" do
action [:enable, :start]
+ subscribes :restart, "systemd_service[renderd]"
end
directory "/srv/tile.openstreetmap.org/tiles" do
mode 0o644
end
-package "python-cairo"
-package "python-mapnik"
+package %w[
+ python-cairo
+ python-mapnik
+ python-setuptools
+]
+
+python_package "pyotp"
-package "fonts-noto-cjk"
-package "fonts-noto-hinted"
-package "fonts-noto-unhinted"
-package "ttf-unifont"
+package %w[
+ fonts-noto-cjk
+ fonts-noto-hinted
+ fonts-noto-unhinted
+ fonts-hanazono
+ ttf-unifont
+]
+
+["NotoSansArabicUI-Regular.ttf", "NotoSansArabicUI-Bold.ttf"].each do |font|
+ remote_file "/usr/share/fonts/truetype/noto/#{font}" do
+ action :create_if_missing
+ source "https://github.com/googlei18n/noto-fonts/raw/master/hinted/#{font}"
+ owner "root"
+ group "root"
+ mode 0o644
+ end
+end
directory "/srv/tile.openstreetmap.org/cgi-bin" do
owner "tile"
owner "tile"
group "tile"
mode 0o755
- variables :blocks => blocks
+ variables :blocks => blocks, :totp_key => web_passwords["totp_key"]
end
template "/srv/tile.openstreetmap.org/cgi-bin/debug" do
nodejs_package "carto"
nodejs_package "millstone"
+systemd_service "update-lowzoom@" do
+ description "Low zoom tile update service for %i layer"
+ user "tile"
+ exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
+ private_tmp true
+ private_devices true
+ private_network true
+ protect_system "full"
+ protect_home true
+ no_new_privileges true
+ restart "on-failure"
+end
+
directory "/srv/tile.openstreetmap.org/styles" do
owner "tile"
group "tile"
variables :style => name
end
- template "/etc/init.d/update-lowzoom-#{name}" do
- source "update-lowzoom.init.erb"
- owner "root"
- group "root"
- mode 0o755
- variables :style => name
- end
-
- service "update-lowzoom-#{name}" do
+ service "update-lowzoom@#{name}" do
action :disable
supports :restart => true
end
execute "#{style_directory}/project.mml" do
action :nothing
- command "carto project.mml > project.xml"
+ command "carto -a 3.0.0 project.mml > project.xml"
cwd style_directory
user "tile"
group "tile"
subscribes :run, "git[#{style_directory}]"
notifies :restart, "service[renderd]", :immediately
- notifies :restart, "service[update-lowzoom-#{name}]"
+ notifies :restart, "service[update-lowzoom@#{name}]"
end
end
postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
postgresql_user "jburgess" do
cluster node[:tile][:database][:cluster]
database "gis"
end
-%w(geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys).each do |table|
+postgresql_extension "hstore" do
+ cluster node[:tile][:database][:cluster]
+ database "gis"
+end
+
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews spatial_ref_sys].each do |table|
postgresql_table table do
cluster node[:tile][:database][:cluster]
database "gis"
end
end
-%w(geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads).each do |table|
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads].each do |table|
postgresql_table table do
cluster node[:tile][:database][:cluster]
database "gis"
file node[:tile][:node_file] do
owner "tile"
group "www-data"
- mode 0o640
+ mode 0o660
end
directory "/var/log/tile" do
mode 0o755
end
-package "osm2pgsql"
-package "osmosis"
-
-package "ruby"
-package "ruby-dev"
+package %w[
+ osm2pgsql
+ ruby
+ osmium-tool
+ pyosmium
+ python-pyproj
+]
-package "libproj-dev"
-package "libxml2-dev"
-
-gem_package "proj4rb"
-gem_package "libxml-ruby"
-
-remote_directory "/usr/local/lib/site_ruby" do
- source "ruby"
+remote_directory "/usr/local/bin" do
+ source "bin"
owner "root"
group "root"
mode 0o755
files_owner "root"
files_group "root"
- files_mode 0o644
+ files_mode 0o755
end
template "/usr/local/bin/expire-tiles" do
mode 0o755
end
-template "/etc/sudoers.d/tile" do
- source "sudoers.erb"
- owner "root"
- group "root"
- mode 0o440
-end
-
directory "/var/lib/replicate" do
owner "tile"
group "tile"
mode 0o755
end
-template "/var/lib/replicate/configuration.txt" do
- source "replicate.configuration.erb"
+directory "/var/lib/replicate/expire-queue" do
owner "tile"
- group "tile"
- mode 0o644
+ group "www-data"
+ mode 0o775
end
template "/usr/local/bin/replicate" do
mode 0o755
end
+systemd_service "expire-tiles" do
+ description "Tile dirtying service"
+ type "simple"
+ user "www-data"
+ exec_start "/usr/local/bin/expire-tiles"
+ standard_output "null"
+ private_tmp true
+ private_devices true
+ protect_system "full"
+ protect_home true
+ no_new_privileges true
+end
+
+systemd_path "expire-tiles" do
+ description "Tile dirtying trigger"
+ directory_not_empty "/var/lib/replicate/expire-queue"
+end
+
+service "expire-tiles.path" do
+ action [:enable, :start]
+ subscribes :restart, "systemd_path[expire-tiles]"
+end
+
systemd_service "replicate" do
description "Rendering database replication service"
after "postgresql.service"
private_devices true
protect_system "full"
protect_home true
+ no_new_privileges true
restart "on-failure"
end
munin_plugin "renderd_zoom"
munin_plugin "renderd_zoom_time"
-munin_plugin "replication_delay" do
- conf "munin.erb"
-end
+munin_plugin "replication_delay"
projects / chef.git / blobdiff