Make elasticsearch standard for all mediawiki setups

diff --git a/cookbooks/mediawiki/metadata.rb b/cookbooks/mediawiki/metadata.rb
index 46daf9a65b4657af8450bffe544b6406fe69f8fa..2551b291ecbe229a0b7830d17ce5531c813af951 100644 (file)
--- 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 267c4f4b152b73382918f439ae065b5ca6a685cb..61c76172519c69867d6461e1d788edac72a317ee 100644 (file)
--- 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 4a775325a47e1ece599196f16c047a1909dff0df..e796399282b37431e1d6226eb674ce0624f5dc3c 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -39,6 +39,5 @@ default_attributes(
 )
 
 run_list(
-  "recipe[elasticsearch]",
   "recipe[wiki]"
 )