redirect reverse geocoding traffic to dulcy

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 7c90c9c87ed9d569e2b87134fd375d83edb74573..50e22907cf4073d76f8b1796e7b8e0d25e7af98c 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -3,7 +3,24 @@ description "Master role applied to ironbelly"
 
 default_attributes(
   :apt => {
-    :sources => [ "ubuntugis-unstable" ]
+    :sources => ["ubuntugis-unstable"]
+  },
+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }
   },
   :git => {
     :allowed_nodes => "*:*",
@@ -56,9 +73,9 @@ default_attributes(
         :uid => "tomh",
         :gid => "tomh",
         :transfer_logging => false,
-        :hosts_allow => [ 
-          "89.16.179.150",                       # shenron
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+        :hosts_allow => [
+          "212.110.172.32",                      # shenron
+          "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant
         ]
       },
@@ -72,7 +89,8 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external
+          "128.40.168.0/24",      # ucl external (wates)
+          "128.40.45.192/27",     # ucl external (wolfson)
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
@@ -83,7 +101,7 @@ default_attributes(
       }
     }
   }
-);
+)
 
 run_list(
   "role[ic]",
@@ -95,7 +113,11 @@ run_list(
   "role[backup]",
   "role[stats]",
   "role[planet]",
+  "role[planetdump]",
+  "role[logstash]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
-  "recipe[git::server]"
+  "recipe[git::server]",
+  "recipe[tilelog]",
+  "recipe[serverinfo]"
 )