X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d8a807d2d3fa09bb14484e03e193c0b37da26daa..5d9d144cf4e7aaf93fc32493cac25256767990e9:/roles/norbert.rb?ds=sidebyside

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 28fc3aaa1..1a67de471 100644
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,49 +2,41 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator },
-      :pnorman => { :status => :user }
-    }
-  },
-  :exim => {
-    :aliases => {
-      :root => "yellowbkpk"
-    }
-  },
   :networking => {
     :interfaces => {
-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.5"
-      },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "ens18",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.202"
+        :address => "89.234.186.100",
+        :prefix => "27",
+        :gateway => "89.234.186.97"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a00:5884:821c::1",
+        :prefix => "48",
+        :gateway => "fe80::204:92:100:1"
       }
     }
   },
-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-	"block/cciss\!c0d0/queue/scheduler" => "noop",
-	"block/cciss\!c0d1/queue/scheduler" => "noop",
-	"block/sda/queue/nr_requests" => "512",
-	"block/sda/queue/scheduler" => "deadline"
-      }
-    }
+  :squid => {
+    :cache_mem => "7500 MB",
+    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
+  },
+  :tilecache => {
+    :tile_parent => "france.render.openstreetmap.org",
+    :tile_siblings => [
+      "noomoahk.openstreetmap.org",
+      "ladon.openstreetmap.org",
+      "culebre.openstreetmap.org"
+    ]
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[hp-g5]"
+  "role[grifon]",
+  "role[tilecache]"
 )