X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2ecb8ca90ac730ada6e083aebd8f3265033f46d5..d7a3c93b3073fae63ca4f9e52c489724b8dea813:/roles/pyrene.rb diff --git a/roles/pyrene.rb b/roles/pyrene.rb index 2d9c8dbfc..680003a89 100644 --- a/roles/pyrene.rb +++ b/roles/pyrene.rb @@ -22,59 +22,20 @@ default_attributes( }, :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "eno1", :role => :external, - :family => :inet, - :address => "140.211.167.98" - }, - :external_ipv6 => { - :interface => "eno1", - :role => :external, - :family => :inet6, - :address => "2605:bc80:3010:700::8cd3:a762" - } - } - }, - :postgresql => { - :settings => { - :defaults => { - :shared_buffers => "8GB", - :maintenance_work_mem => "7144MB", - :effective_cache_size => "16GB" - } - } - }, - :sysctl => { - :postgres => { - :comment => "Increase shared memory for postgres", - :parameters => { - "kernel.shmmax" => 9 * 1024 * 1024 * 1024, - "kernel.shmall" => 9 * 1024 * 1024 * 1024 / 4096 - } - } - }, - :tile => { - :database => { - :cluster => "12/main", - :postgis => "3" - }, - :mapnik => "3.1", - :styles => { - :default => { - :tile_directories => [ - { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 } - ] + :inet => { + :address => "140.211.167.98" + }, + :inet6 => { + :address => "2605:bc80:3010:700::8cd3:a762" + } } - }, - :ratelimit => { - :requests_per_second => 30, - :maximum_backlog => 3600 } } ) run_list( - "role[osuosl]", - "role[tile]" + "role[osuosl]" )