From 90dd2b384415fc6a60a64a73333ee58ffaaf6250 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 25 Feb 2017 19:38:35 +0000 Subject: [PATCH] Disable wikidiff2 --- cookbooks/mediawiki/recipes/default.rb | 6 +++++- cookbooks/mediawiki/templates/default/LocalSettings.php.erb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cookbooks/mediawiki/recipes/default.rb b/cookbooks/mediawiki/recipes/default.rb index 2ecaaa4eb..ffd0f0d1f 100644 --- a/cookbooks/mediawiki/recipes/default.rb +++ b/cookbooks/mediawiki/recipes/default.rb @@ -67,7 +67,11 @@ end apache_module "php7.0" link "/etc/php/7.0/apache2/conf.d/20-wikidiff2.ini" do - to "../../mods-available/wikidiff2.ini" + action :delete 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 80a5e8710..9f2e7f5a2 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), -- 2.43.2