Merge remote-tracking branch 'github/pull/74'

[chef.git] / roles / foundation.rb

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 8e763bfcef71819dfe187c838652febd6d76bfaa..4926edeb2e59fbdd990c471fc92f9f5a6613ba30 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -8,7 +8,15 @@ default_attributes(
     :keepalive => false
   },
   :apt => {
-    :sources => [ "brightbox", "aw-drupal" ]
+    :sources => ["passenger"]
+  },
+  :elasticsearch => {
+    :cluster => {
+      :name => "foundation"
+    },
+    :script => {
+      :disable_dynamic => false
+    }
   },
   :memcached => {
     :memory_limit => 400,
@@ -18,5 +26,9 @@ default_attributes(
 )
 
 run_list(
-  "recipe[civicrm]"
+  "role[crm]",
+  "role[elasticsearch]",
+  "recipe[foundation::wiki]",
+  "recipe[foundation::board]",
+  "recipe[foundation::dwg]"
 )