Install curl on the dev server

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

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index aec9e1b81c39eab583279d93e46716bd2f9b037b..6d58bf8067de22de21f17815426a6bd92541db51 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
+  python3-pyotp
   python3-pyproj
   python3-setuptools
 ]
 
-python_package "pyotp" do
-  python_version "3"
-end
-
 directory "/srv/tile.openstreetmap.org/cgi-bin" do
   owner "tile"
   group "tile"
@@ -508,6 +505,10 @@ directory "/var/log/tile" do
   mode "755"
 end
 
+apt_preference "osm2pgsql" do
+  action :remove
+end
+
 package %w[
   osm2pgsql
   osmium-tool
@@ -577,18 +578,6 @@ template "/usr/local/bin/replicate-post" do
   mode "755"
 end
 
-osm2pgsql_arguments = %w[
-    --number-processes=1
-    --log-progress=false
-    --expire-tiles=13-19
-    --expire-segment-length=90000
-    --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"