X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/79a6a40b71261011c4c5fac81cddf288f46ca1d1..a57bc7272b747eae6c08f79df516b6ddc3f5b71f:/roles/planet.rb diff --git a/roles/planet.rb b/roles/planet.rb index f7ef5717e..d7f349b44 100644 --- a/roles/planet.rb +++ b/roles/planet.rb @@ -2,15 +2,36 @@ name "planet" description "Role applied to all planet servers" default_attributes( - :accounts => { - :users => { - :bretth => { :status => :user }, - :planet => { - :status => :administrator, - :members => [:bretth] - } + :apache => { + :mpm => "event", + :keepalive => true, + :event => { + :server_limit => 20, + :max_request_workers => 1000, + :threads_per_child => 50, + :min_spare_threads => 75, + :max_spare_threads => 525, + :listen_cores_buckets_ratio => 4 + } + }, + :networking => { + :firewall => { + :http_connection_limit => 10 } }, + :prometheus => { + :files => %w[ + /store/planet/notes/planet-notes-latest.osn.bz2 + /store/planet/pbf/planet-latest.osm.pbf + /store/planet/planet/changesets-latest.osm.bz2 + /store/planet/planet/discussions-latest.osm.bz2 + /store/planet/planet/planet-latest.osm.bz2 + /store/planet/replication/changesets/state.yaml + /store/planet/replication/day/state.txt + /store/planet/replication/hour/state.txt + /store/planet/replication/minute/state.txt + ] + }, :rsyncd => { :modules => { :planet => { @@ -28,25 +49,19 @@ default_attributes( :ignore_nonreadable => true, :timeout => 3600, :refuse_options => ["checksum"] + }, + :statistics => { + :comment => "Statistics", + :path => "/store/planet/statistics", + :read_only => false, + :write_only => true, + :list => false, + :uid => "planet", + :gid => "planet", + :transfer_logging => false, + :nodes_allow => "roles:web-statistics" } } - }, - :networking => { - :firewall => { - :http_connection_limit => 10 - } - }, - :apache => { - :mpm => "event", - :keepalive => true, - :event => { - :server_limit => 20, - :max_request_workers => 1000, - :threads_per_child => 50, - :min_spare_threads => 75, - :max_spare_threads => 525, - :async_request_worker_factor => 4 - } } ) @@ -54,6 +69,5 @@ run_list( "role[web-db]", "recipe[planet]", "recipe[planet::replication]", - "recipe[nfs::server]", "recipe[rsyncd]" )