From 918b2340b4a44045125b50525d432a1e2648eeb2 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Mar 2015 16:18:56 +0100
Subject: [PATCH] Make elasticsearch standard for all mediawiki setups

---
 cookbooks/mediawiki/metadata.rb        | 1 +
 cookbooks/mediawiki/recipes/default.rb | 1 +
 roles/wiki.rb                          | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb
index 46daf9a65..2551b291e 100644
--- a/cookbooks/mediawiki/metadata.rb
+++ b/cookbooks/mediawiki/metadata.rb
@@ -9,3 +9,4 @@ depends           "memcached"
 depends           "apache"
 depends           "mysql"
 depends           "git"
+depends           "elasticsearch"
diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index 267c4f4b1..61c761725 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -21,6 +21,7 @@ include_recipe "memcached"
 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
+include_recipe "elasticsearch"
 
 # Mediawiki Base Requirements
 package "php5"
diff --git a/roles/wiki.rb b/roles/wiki.rb
index 4a775325a..e79639928 100644
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -39,6 +39,5 @@ default_attributes(
 )
 
 run_list(
-  "recipe[elasticsearch]",
   "recipe[wiki]"
 )
-- 
2.43.2