jenkins-bot has submitted this change and it was merged.
Change subject: Fix SVG conversion on wikitech
......................................................................
Fix SVG conversion on wikitech
rsvg-secure is not rsvg-broken but is still broken, at least on wikitech
Because wikitech does not run HHVM but does run on Trusty, which
should have the fixed librsvg2-bin package.
$ rsvg-convert --version
non-HHVM, terbium: rsvg-convert version 2.36.1 (Wikimedia)
non-HHVM, silver: rsvg-convert version 2.40.2
HHVM, mw1001: rsvg-convert version 2.40.2
Bug: T93041
Change-Id: I932e37d7b7b1d6d284bd3c212a1a8845bd036a5f
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 8 insertions(+), 0 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index bb7ff02..3eb5487 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -424,6 +424,10 @@
} else {
# This converter will only work when rsvg has a suitable security patch
$wgSVGConverters['rsvg-secure'] = '$path/rsvg-convert
--no-external-files -w $width -h $height -o $output $input';
+
+ // Special config for wikitech which runs trusty (and therefore the new
librsvg2-bin package),
+ // but on PHP 5.5 (not HHVM)
+ $wgSVGConverters['rsvg-wikitech'] = '$path/rsvg-convert -w $width -h
$height -o $output $input';
}
#######################################################################
# Squid Configuration
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index dfa8fba..daf8b1a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9986,6 +9986,10 @@
# SVG related @{
'wgSVGConverter' => array(
'default' => 'rsvg-secure',
+
+ // silver runs PHP 5.5 (not HHVM) on trusty, and therefore has the
security
+ // patch by default (and no --no-external-files) so rsvg-secure is
broken
+ 'labswiki' => 'rsvg-wikitech',
),
'wgSVGConverterPath' => array(
'default' => '/usr/bin',
--
To view, visit https://gerrit.wikimedia.org/r/231158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I932e37d7b7b1d6d284bd3c212a1a8845bd036a5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
