X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6393de85ce947f2ca1dc38365c779b748ed966b5..b0e42ea229284e21d5d05b2e87153c733efb81d1:/roles/nepomuk.rb diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index b7addd58c..b0c99c73f 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -3,29 +3,43 @@ description "Master role applied to nepomuk" default_attributes( :networking => { + :firewall => { + :inet => [ + { + :action => "ACCEPT", + :source => "net:77.95.64.120,77.95.64.131,77.95.64.139", + :dest => "fw", + :proto => "tcp", + :dest_ports => "5666", + :source_ports => "1024:", + :rate_limit => "-", + :connection_limit => "-" + } + ] + }, :interfaces => { :external_ipv4 => { :interface => "eth0", :role => :external, :family => :inet, - :address => "77.95.70.166", + :address => "77.95.65.39", :prefix => "27", - :gateway => "77.95.70.161" + :gateway => "77.95.65.33" }, :external_ipv6 => { :interface => "eth0", :role => :external, :family => :inet6, - :address => "2a03:9180:1:21::a6", + :address => "2a03:9180:0:100::7", :prefix => "64", - :gateway => "2a03:9180:1:21::a1" + :gateway => "2a03:9180:0:100::1" } } }, :sysctl => { :kvm => { :comment => "Tuning for KVM guest", - :parameters => { + :parameters => { "kernel.sched_min_granularity_ns" => 10000000, "kernel.sched_wakeup_granularity_ns" => 15000000 } @@ -39,18 +53,17 @@ default_attributes( :hdd_tune => { :comment => "Tune the queue for improved performance", :parameters => { - "block/vda/queue/nr_requests" => "128", - "block/vda/queue/scheduler" => "deadline" + "block/vda/queue/nr_requests" => "128" } } }, :tilecache => { - :tile_parent => "lyon.render.openstreetmap.org", + :tile_parent => "france.render.openstreetmap.org", :tile_siblings => [ "trogdor.openstreetmap.org", - "tabaluga.openstreetmap.org", + "katie.openstreetmap.org", + "konqi.openstreetmap.org", "ridgeback.openstreetmap.org", - "fume.openstreetmap.org", "gorynych.openstreetmap.org" ] }