Configure eddie as a database master

[chef.git] / cookbooks / tile / recipes / default.rb

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 615afb84431f6a3b58e0bc2d9737f3df5562dbb7..6cdf6190f33623bc8dde2b18cc42fed2f579375f 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "apache"
 include_recipe "git"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
@@ -121,11 +122,12 @@ package "python-cairo"
 package "python-mapnik"
 package "python-setuptools"
 
-easy_install_package "pyotp"
+python_package "pyotp"
 
 package "fonts-noto-cjk"
 package "fonts-noto-hinted"
 package "fonts-noto-unhinted"
+package "fonts-hanazono"
 package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
@@ -242,7 +244,7 @@ nodejs_package "millstone"
 systemd_service "update-lowzoom@" do
   description "Low zoom tile update service for %i layer"
   user "tile"
-  exec_start "/usr/local/bin/update-lowzoom-%i"
+  exec_start "/bin/bash /usr/local/bin/update-lowzoom-%i"
   private_tmp true
   private_devices true
   private_network true
@@ -369,7 +371,12 @@ postgresql_extension "postgis" do
   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"
@@ -378,7 +385,7 @@ end
   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"
@@ -461,7 +468,7 @@ end
 
 systemd_service "expire-tiles" do
   description "Tile dirtying service"
-  type "oneshot"
+  type "simple"
   user "www-data"
   exec_start "/usr/local/bin/expire-tiles"
   standard_output "null"