Merge remote-tracking branch 'github/pull/451'

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

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index ae89aa8d6b735ecdd53b503f1493be07c88a02b0..1396f5cc6204350fd7d0274d27306bae9ef095fe 100644 (file)
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -1,14 +1,21 @@
-default[:tile][:database][:cluster] = "10/main"
-default[:tile][:database][:postgis] = "2.4"
+default[:tile][:database][:cluster] = "12/main"
+default[:tile][:database][:postgis] = "3"

 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true
 default[:tile][:database][:hstore] = true
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 
 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true
 default[:tile][:database][:hstore] = true
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 

+default[:tile][:mapnik] = "3.0"
+
+default[:tile][:replication][:url] = "https://planet.osm.org/replication/minute/"
+

 default[:tile][:data] = {}
 default[:tile][:styles] = {}
 
 default[:tile][:data] = {}
 default[:tile][:styles] = {}
 

-default[:postgresql][:versions] |= ["10"]
+default[:tile][:ratelimit][:requests_per_second] = 15
+default[:tile][:ratelimit][:maximum_backlog] = 1800
+
+default[:postgresql][:versions] |= [node[:tile][:database][:cluster].split("/").first]

 
 default[:accounts][:users][:tile][:status] = :role
 
 default[:accounts][:users][:tile][:status] = :role