Make elasticsearch standard for all mediawiki setups
authorTom Hughes <tom@compton.nu>
Sun, 29 Mar 2015 15:18:56 +0000 (16:18 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 29 Mar 2015 15:18:56 +0000 (16:18 +0100)
cookbooks/mediawiki/metadata.rb
cookbooks/mediawiki/recipes/default.rb
roles/wiki.rb

index 46daf9a..2551b29 100644 (file)
@@ -9,3 +9,4 @@ depends           "memcached"
 depends           "apache"
 depends           "mysql"
 depends           "git"
+depends           "elasticsearch"
index 267c4f4..61c7617 100644 (file)
@@ -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"
index 4a77532..e796399 100644 (file)
@@ -39,6 +39,5 @@ default_attributes(
 )
 
 run_list(
-  "recipe[elasticsearch]",
   "recipe[wiki]"
 )