X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/78ec3a03182ba596b3a35bb54a91fed60fb88cbd..27577e9442f9b85f4b9b3c91350c38e7be282caf:/roles/bytemark.rb?ds=sidebyside diff --git a/roles/bytemark.rb b/roles/bytemark.rb index 6d539ff5f..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,7 +29,7 @@ default_attributes( } }, :web => { - :backends => %w(rails4 rails5), + :backends => %w[rails4 rails5], :fileserver => "grisu", :readonly_database_host => "katla.bm.openstreetmap.org" } @@ -35,6 +37,7 @@ default_attributes( override_attributes( :networking => { + :nameservers => ["10.0.32.20"], :search => ["bm.openstreetmap.org", "openstreetmap.org"] }, :ntp => {