Add IPv6 addresses to dulcy

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index a05cd0fd9dcf2e5b6cc7479a1caa8211a69da452..13b8973634aed84b3df57dfc070002aa569d4072 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -159,14 +159,11 @@ end
 package %w[
   python3-cairo
   python3-mapnik
 package %w[
   python3-cairo
   python3-mapnik

+  python3-pyotp

   python3-pyproj
   python3-setuptools
 ]
 
   python3-pyproj
   python3-setuptools
 ]
 

-python_package "pyotp" do
-  python_version "3"
-end
-

 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"


@@ -303,6 +300,72 @@ systemd_service "update-lowzoom@" do
   restart "on-failure"
 end
 
   restart "on-failure"
 end
 

+postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
+
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
+
+postgresql_user "jburgess" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "tomh" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "pnorman" do
+  cluster node[:tile][:database][:cluster]
+  superuser true
+end
+
+postgresql_user "tile" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_user "www-data" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_user "_renderd" do
+  cluster node[:tile][:database][:cluster]
+end
+
+postgresql_database "gis" do
+  cluster node[:tile][:database][:cluster]
+  owner "tile"
+end
+
+postgresql_extension "postgis" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+end
+
+postgresql_extension "hstore" do
+  cluster node[:tile][:database][:cluster]
+  database "gis"
+  only_if { node[:tile][:database][:hstore] }
+end
+
+%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table|
+  postgresql_table table do
+    cluster node[:tile][:database][:cluster]
+    database "gis"
+    owner "tile"
+    permissions "tile" => :all
+  end
+end
+
+%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table|
+  postgresql_table table do
+    cluster node[:tile][:database][:cluster]
+    database "gis"
+    owner "tile"
+    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
+  end
+end
+

 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"
 directory "/srv/tile.openstreetmap.org/styles" do
   owner "tile"
   group "tile"


@@ -386,6 +449,18 @@ node[:tile][:styles].each do |name, details|
     end
   end
 
     end
   end
 

+  if details[:functions_script]
+    postgresql_execute details[:functions_script] do
+      action :nothing
+      command details[:functions_script]
+      cluster node[:tile][:database][:cluster]
+      database "gis"
+      user "tile"
+      group "tile"
+      subscribes :run, "git[#{style_directory}]"
+    end
+  end
+

   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.22 project.mml > project.xml"
   execute "#{style_directory}/project.mml" do
     action :nothing
     command "carto -a 3.0.22 project.mml > project.xml"


@@ -398,72 +473,6 @@ node[:tile][:styles].each do |name, details|
   end
 end
 
   end
 end
 

-postgresql_version = node[:tile][:database][:cluster].split("/").first
-postgis_version = node[:tile][:database][:postgis]
-
-package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
-
-postgresql_user "jburgess" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "tomh" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "pnorman" do
-  cluster node[:tile][:database][:cluster]
-  superuser true
-end
-
-postgresql_user "tile" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_user "www-data" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_user "_renderd" do
-  cluster node[:tile][:database][:cluster]
-end
-
-postgresql_database "gis" do
-  cluster node[:tile][:database][:cluster]
-  owner "tile"
-end
-
-postgresql_extension "postgis" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-end
-
-postgresql_extension "hstore" do
-  cluster node[:tile][:database][:cluster]
-  database "gis"
-  only_if { node[:tile][:database][:hstore] }
-end
-
-%w[geography_columns planet_osm_nodes planet_osm_rels planet_osm_ways raster_columns raster_overviews].each do |table|
-  postgresql_table table do
-    cluster node[:tile][:database][:cluster]
-    database "gis"
-    owner "tile"
-    permissions "tile" => :all
-  end
-end
-
-%w[geometry_columns planet_osm_line planet_osm_point planet_osm_polygon planet_osm_roads spatial_ref_sys].each do |table|
-  postgresql_table table do
-    cluster node[:tile][:database][:cluster]
-    database "gis"
-    owner "tile"
-    permissions "tile" => :all, "www-data" => :select, "_renderd" => :select
-  end
-end
-

 package %w[
   gdal-bin
   python3-yaml
 package %w[
   gdal-bin
   python3-yaml


@@ -577,17 +586,6 @@ template "/usr/local/bin/replicate-post" do
   mode "755"
 end
 
   mode "755"
 end
 

-osm2pgsql_arguments = %w[
-    --number-processes=1
-    --log-progress=false
-    --expire-tiles=13-19
-    --expire-output=/var/lib/replicate/dirty-tiles.txt
-  ]
-
-osm2pgsql_arguments.append("--multi-geometry") if node[:tile][:database][:multi_geometry]
-osm2pgsql_arguments.append("--hstore") if node[:tile][:database][:hstore]
-osm2pgsql_arguments.append("--tag-transform-script=#{node[:tile][:database][:tag_transform_script]}") if node[:tile][:database][:tag_transform_script]
-

 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"
 systemd_service "replicate" do
   description "Rendering database replication service"
   after "postgresql.service"


@@ -670,7 +668,19 @@ tile_directories.each do |directory|
   end
 end
 
   end
 end
 

-package "ruby-webrick"
+package %w[
+  ruby-pg
+  ruby-webrick
+]
+
+prometheus_exporter "osm2pgsql" do
+  port 10027
+  user "tile"
+  restrict_address_families "AF_UNIX"
+  options [
+    "--database-name=gis"
+  ]
+end

 
 prometheus_exporter "modtile" do
   port 9494
 
 prometheus_exporter "modtile" do
   port 9494