Update piwik to 4.6.2

[chef.git] / roles / longma.rb

diff --git a/roles/longma.rb b/roles/longma.rb
index 0cf93f0cb8441f764e6f8ad07d5d664974618c2c..2b362d8eb6b43ee90d0901b4538ac199c14cc2ef 100644 (file)
--- a/roles/longma.rb
+++ b/roles/longma.rb
@@ -2,53 +2,37 @@ name "longma"
 description "Master role applied to longma"
 
 default_attributes(
-  :exim => {
-    :aliases => {
-      :root => "ceasar"
-    }
-  },
   :networking => {
     :interfaces => {
+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.13",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3]
+        }
+      },
       :external_ipv4 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet,
-        :address => "140.110.240.7",
-        :prefix => "24",
-        :gateway => "140.110.240.254"
+        :address => "184.104.226.109"
       },
       :external_ipv6 => {
-        :interface => "ens160",
+        :interface => "bond0.101",
         :role => :external,
         :family => :inet6,
-        :address => "2001:e10:2000:240::7",
-        :prefix => "64",
-        :gateway => "2001:e10:2000:240::254"
-      }
-    }
-  },
-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :nginx => {
-    :cache => {
-      :proxy => {
-        :directory => "/store/nginx-cache/proxy-cache"
+        :address => "2001:470:1:b3b::d"
       }
     }
-  },
-  :tilecache => {
-    :tile_parent => "hsinchu.render.openstreetmap.org",
-    :tile_siblings => [
-      "balerion.openstreetmap.org",
-      "waima.openstreetmap.org",
-      "tuatara.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[nchc]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[nominatim]"
 )