jenkins-bot has submitted this change and it was merged.
Change subject: Mathoid: update dependencies and config
......................................................................
Mathoid: update dependencies and config
Mathoid now uses librsvg for rendering PNGs, so the java package has be
dropped and librsvg2* packages are now required. This patch also
freshens up a bit its configuration.
Bug; T121447
Change-Id: Ia6bb32cccc97948f31861983d17827351f17d9f7
---
M puppet/hieradata/common.yaml
M puppet/modules/mathoid/manifests/init.pp
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index a8b5ce2..30c5b2e 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -176,6 +176,7 @@
mathoid::png: true
mathoid::texvcinfo: true
mathoid::speak_text: true
+mathoid::render_no_check: true
graphoid::base_path: "%{hiera('mwv::services_dir')}/graphoid"
graphoid::node_path: "%{hiera('graphoid::base_path')}/node_modules"
diff --git a/puppet/modules/mathoid/manifests/init.pp
b/puppet/modules/mathoid/manifests/init.pp
index 45d2b3b..381e9be 100644
--- a/puppet/modules/mathoid/manifests/init.pp
+++ b/puppet/modules/mathoid/manifests/init.pp
@@ -23,6 +23,9 @@
# [*speak_text*]
# Whether to generate speakText representation. Default: true
#
+# [*render_no_check*]
+# Whether not to perform input checks on renders.
+#
# [*log_level*]
# The lowest level to log (trace, debug, info, warn, error, fatal)
#
@@ -33,14 +36,11 @@
$png,
$speak_text,
$texvcinfo,
+ $render_no_check,
$log_level = undef,
) {
- # TODO Add dependency to node-jsdom once
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742347
- # is fixed
-
- require_package('openjdk-8-jre-headless')
+ require_package('librsvg2-2', 'librsvg2-dev')
service::node { 'mathoid':
port => $port,
@@ -50,7 +50,8 @@
img => $img,
png => $png,
texvcinfo => $texvcinfo,
- speakText => $speak_text,
+ speech_on => $speak_text,
+ no_check => $render_no_check,
},
}
--
To view, visit https://gerrit.wikimedia.org/r/276930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6bb32cccc97948f31861983d17827351f17d9f7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
