X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c2623e1ade43795e85f045d576495453b53f4a1f..1af304f7852542300224c6634686933f3c93652d:/roles/ironbelly.rb?ds=sidebyside

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 029c54b40..ab306c6a2 100644
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -6,12 +6,24 @@ default_attributes(
     :sources => ["ubuntugis-unstable"]
   },
   :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
     :path => {
       :data => "/store/elasticsearch"
     }
   },
   :git => {
-    :allowed_nodes => "*:*",
+    :allowed_nodes => "fqdn:*",
     :user => "chefrepo",
     :group => "chefrepo",
     :backup => "chef-git"
@@ -47,9 +59,27 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
+      },
+      :aws2ic => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
+      },
+      :ic2bm => {
+        :port => "1196",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1194"
+        }
       }
     }
   },
+  :planet => {
+    :replication => "enabled"
+  },
   :rsyncd => {
     :modules => {
       :hosts => {
@@ -77,11 +107,13 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
+          "193.60.236.0/24",      # ucl external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
+          "10.0.32.0/20",         # bytemark internal
+          "89.16.162.16/28",      # bytemark external
+          "2001:41c9:2:d6::/64",  # bytemark external
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],
@@ -103,8 +135,10 @@ run_list(
   "role[planet]",
   "role[planetdump]",
   "role[logstash]",
+  "role[letsencrypt]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",
-  "recipe[tilelog]"
+  "recipe[tilelog]",
+  "recipe[serverinfo]"
 )