X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/215373326fae6ef0fa85eeeb40f5d17943e3d533..bb6a3be37eb6b0de039c6451dcad0fe3bddbf55d:/roles/bytemark.rb diff --git a/roles/bytemark.rb b/roles/bytemark.rb index ff4e45ace..7b0624752 100644 --- a/roles/bytemark.rb +++ b/roles/bytemark.rb @@ -5,12 +5,14 @@ default_attributes( :hosted_by => "Bytemark", :location => "York, England", :networking => { - :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"], :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 => { @@ -27,13 +29,15 @@ default_attributes( } }, :web => { - :backends => %w(rails4 rails5), - :fileserver => "grisu" + :backends => %w[rails4 rails5], + :fileserver => "grisu", + :readonly_database_host => "katla.bm.openstreetmap.org" } ) override_attributes( :networking => { + :nameservers => ["10.0.32.20"], :search => ["bm.openstreetmap.org", "openstreetmap.org"] }, :ntp => {