X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/08d53c89b09fb5bf08da3083e6f4598de4b1f041..0fb1998d0fa1a3867b036e08ef2f637ea14e33ce:/roles/bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 7bcd61406..93f652b1d 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,19 +2,45 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 default_attributes(
+  :hosted_by => "Bytemark",
+  :location => "York, England",
   :networking => {
-    :nameservers => [ "[2001:41c8:2::2]", "[2001:41c8:2::1]", "80.68.80.25", "80.68.80.24" ],
     :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.32.20",
+          :routes => {
+            "10.0.0.0/8" => { :via => "10.0.32.20" }
+          }
+        }
+      },
       :external => {
-        :zone => "bm"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
+  },
+  :web => {
+    :fileserver => "grisu",
+    :readonly_database_host => "katla.bm.openstreetmap.org"
   }
 )
 
 override_attributes(
+  :networking => {
+    :nameservers => ["10.0.32.20"],
+    :search => ["bm.openstreetmap.org", "openstreetmap.org"]
+  },
   :ntp => {
-    :servers => [ "0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org" ]
+    :servers => ["0.uk.pool.ntp.org", "1.uk.pool.ntp.org", "europe.pool.ntp.org"]
   }
 )