Muehlenhoff has submitted this change and it was merged.

Change subject: Disable the firejail wrapper for imagemagick temporarily
......................................................................


Disable the firejail wrapper for imagemagick temporarily

This affects the Score extension running on the app servers (which
don't have firejail installed). Revert to stock "convert" for now to sort
this out properly (by also installing firejail and the wrapper on the
standard application servers and running some tests with the Score extension
and firejail).

Change-Id: I98612bc29f2dc96829c40c2653195b1582f03c34
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index d0cc04a..8d71186 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -447,7 +447,7 @@
 
 $wgUseImageResize               = true;
 $wgUseImageMagick               = true;
-$wgImageMagickConvertCommand    = '/usr/local/bin/mediawiki-firejail-convert';
+$wgImageMagickConvertCommand    = '/usr/bin/convert';
 $wgSharpenParameter = '0x0.8'; # for IM>6.5, T26857
 
 $wgFileBlacklist[] = 'txt';

-- 
To view, visit https://gerrit.wikimedia.org/r/292337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I98612bc29f2dc96829c40c2653195b1582f03c34
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to