Make elasticsearch standard for all mediawiki setups

[chef.git] / cookbooks / mediawiki / recipes / default.rb

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index d6d90caa1f762f67758587852f85570cbec25f81..61c76172519c69867d6461e1d788edac72a317ee 100644 (file)
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -21,8 +21,9 @@ include_recipe "memcached"
 include_recipe "apache::ssl"
 include_recipe "mysql"
 include_recipe "git"
+include_recipe "elasticsearch"
 
-#Mediawiki Base Requirements
+# Mediawiki Base Requirements
 package "php5"
 package "php5-cli"
 package "php5-curl"
@@ -34,16 +35,20 @@ package "libapache2-mod-php5"
 
 package "php-wikidiff2"
 
-#Mediawiki Image + SVG support
+# Mediawiki Image + SVG support
 package "imagemagick"
 package "librsvg2-bin"
 
-#Mediawiki PDF support via Extension:PdfHandler
+# Mediawiki PDF support via Extension:PdfHandler
 package "ghostscript"
 package "poppler-utils"
 
-#Mediawiki backup
+# Mediawiki backup
 package "xz-utils"
 
+link "/etc/php5/apache2/conf.d/20-wikidiff2.ini" do
+  to "../../mods-available/wikidiff2.ini"
+end
+
 apache_module "php5"
 apache_module "rewrite"