X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/bf9d74eedb044cd3ff3050f97fb0ef3eebe53469..fd98b3c103f6e6153e42cc3860f2ed61f1f4c5db:/roles/bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 8c65a4b43..ff4e45ace 100644
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -2,19 +2,42 @@ name "bytemark"
 description "Role applied to all servers at Bytemark"
 
 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" ],
+    :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"
+        }
+      },
       :external => {
-        :zone => "bm"
+        :zone => "bm",
+        :inet => {
+          :prefix => "28",
+          :gateway => "89.16.162.17"
+        },
+        :inet6 => {
+          :prefix => "64",
+          :gateway => "fe80::1"
+        }
       }
     }
+  },
+  :web => {
+    :backends => %w(rails4 rails5),
+    :fileserver => "grisu"
   }
 )
 
 override_attributes(
+  :networking => {
+    :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"]
   }
 )