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 4293427b6c5bb5435e1b1c4a4ee533eed2772dd1..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 "git"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "python"

 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")
 include_recipe "tools"
 
 blocks = data_bag_item("tile", "blocks")


@@ -121,11 +122,12 @@ package "python-cairo"
 package "python-mapnik"
 package "python-setuptools"
 
 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-noto-cjk"
 package "fonts-noto-hinted"
 package "fonts-noto-unhinted"

+package "fonts-hanazono"

 package "ttf-unifont"
 
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
 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"
 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
   private_tmp true
   private_devices true
   private_network true


@@ -369,7 +371,12 @@ postgresql_extension "postgis" do
   database "gis"
 end
 
   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"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -378,7 +385,7 @@ end
   end
 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"
   postgresql_table table do
     cluster node[:tile][:database][:cluster]
     database "gis"


@@ -433,19 +440,18 @@ template "/usr/local/bin/expire-tiles" do
   mode 0o755
 end
 
   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
 
 directory "/var/lib/replicate" do
   owner "tile"
   group "tile"
   mode 0o755
 end
 

+directory "/var/lib/replicate/expire-queue" do
+  owner "tile"
+  group "www-data"
+  mode 0o775
+end
+

 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"
 template "/var/lib/replicate/configuration.txt" do
   source "replicate.configuration.erb"
   owner "tile"


@@ -460,6 +466,29 @@ template "/usr/local/bin/replicate" do
   mode 0o755
 end
 
   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"
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"


@@ -470,6 +499,7 @@ systemd_service "replicate" do
   private_devices true
   protect_system "full"
   protect_home true
   private_devices true
   protect_system "full"
   protect_home true

+  no_new_privileges true

   restart "on-failure"
 end
 
   restart "on-failure"
 end