Add IPv6 addresses to dulcy

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

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 2336205d9e95f03ece9c0bb51cba6869ced72be8..cc5803d001257346ba7bf85ca08da530ce4ab84d 100644 (file)
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:tile][:database][:cluster] = "12/main"
+default[:tile][:database][:cluster] = "14/main"

 default[:tile][:database][:postgis] = "3"
 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true
 default[:tile][:database][:postgis] = "3"
 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true


@@ -6,13 +6,19 @@ default[:tile][:database][:hstore] = true
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 

-default[:tile][:mapnik] = "3.0"
+default[:tile][:mapnik] = "3.1"

 
 

-default[:tile][:replication][:url] = "https://planet.osm.org/replication/minute/"
+default[:tile][:replication][:directory] = "/var/lib/replicate"
+default[:tile][:replication][:url] = "https://osm-planet-eu-central-1.s3.dualstack.eu-central-1.amazonaws.com/planet/replication/minute"

 
 default[:tile][:data] = {}
 default[:tile][:styles] = {}
 
 default[:postgresql][:versions] |= [node[:tile][:database][:cluster].split("/").first]
 
 default[:tile][:data] = {}
 default[:tile][:styles] = {}
 
 default[:postgresql][:versions] |= [node[:tile][:database][:cluster].split("/").first]

+default[:postgresql][:monitor_database] = "gis"

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

+
+default[:apache][:event][:server_limit] = node.cpu_cores * 5 / 4
+default[:apache][:event][:max_request_workers] = node.cpu_cores * node[:apache][:event][:threads_per_child]
+default[:apache][:event][:max_spare_threads] = node.cpu_cores * node[:apache][:event][:threads_per_child]