From: Tom Hughes <tom@compton.nu>
Date: Sat, 25 Feb 2017 20:26:35 +0000 (+0000)
Subject: Re-enable wikdiff2
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1fcdb60994e181c758ebda4f5ccfc4e2280d8f0c?ds=sidebyside

Re-enable wikdiff2
---

diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb
index ffd0f0d1f..2ecaaa4eb 100644
--- a/cookbooks/mediawiki/recipes/default.rb
+++ b/cookbooks/mediawiki/recipes/default.rb
@@ -67,11 +67,7 @@ end
 apache_module "php7.0"
 
 link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
-  action :delete
+  to "../../mods-available/wikidiff2.ini"
 end
 
-# link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do
-#   to "../../mods-available/wikidiff2.ini"
-# end
-
 apache_module "rewrite"
diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index 9f2e7f5a2..80a5e8710 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -149,7 +149,7 @@ $wgRightsIcon = "/cc-wiki.png";
 # Path to the GNU diff3 utility. Used for conflict resolution.
 $wgDiff3 = "/usr/bin/diff3";
 
-#$wgExternalDiffEngine = 'wikidiff2';
+$wgExternalDiffEngine = 'wikidiff2';
 
 # Query string length limit for ResourceLoader. You should only set this if
 # your web server has a query string length limit (then set it to that limit),