Allow database connections from VPN addresses

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index fb86c78f09e8d349428500cefda7860ac59d66c3..0cdc647e1d4b16622b54a4f1dead9a868ccc763f 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -5,6 +5,23 @@ default_attributes(
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },
   :apt => {
     :sources => ["ubuntugis-unstable"]
   },

+  :elasticsearch => {
+    :cluster => {
+      :routing => {
+        :allocation => {
+          :disk => {
+            :watermark => {
+              :low => "95%",
+              :high => "98%"
+            }
+          }
+        }
+      }
+    },
+    :path => {
+      :data => "/store/elasticsearch"
+    }
+  },

   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",
   :git => {
     :allowed_nodes => "*:*",
     :user => "chefrepo",


@@ -42,6 +59,21 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
         :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"
+        }

       }
     }
   },
       }
     }
   },


@@ -101,5 +133,6 @@ run_list(
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",

-  "recipe[tilelog]"
+  "recipe[tilelog]",
+  "recipe[serverinfo]"

 )
 )