X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6587b1e16f42817f608eb653fa8987a299dca6c9..682e1fcdcb50f1cf42560a905512487c02dbdcb4:/roles/bytemark.rb diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 209717f76..8f23bd5d0 100644 --- a/roles/bytemark.rb +++ b/roles/bytemark.rb @@ -5,16 +5,17 @@ default_attributes( :hosted_by => "Bytemark", :location => "York, England", :networking => { - :nameservers => ["80.68.80.24", "80.68.80.25", "2001:41c8:2::1", "2001:41c8:2::2"], :roles => { :internal => { :inet => { :prefix => "20", - :gateway => "10.0.32.20" + :gateway => "10.0.32.20", + :routes => { + "10.0.0.0/8" => { :via => "10.0.32.20" } + } } }, :external => { - :zone => "bm", :inet => { :prefix => "28", :gateway => "89.16.162.17" @@ -25,16 +26,12 @@ default_attributes( } } } - }, - :web => { - :backends => %w[rails4 rails5], - :fileserver => "grisu", - :readonly_database_host => "katla.bm.openstreetmap.org" } ) override_attributes( :networking => { + :nameservers => ["8.8.8.8", "8.8.4.4"], :search => ["bm.openstreetmap.org", "openstreetmap.org"] }, :ntp => {