jenkins-bot has submitted this change and it was merged. Change subject: Adding roles for the ProofreadPage and WikiEditor extension ......................................................................
Adding roles for the ProofreadPage and WikiEditor extension Change-Id: Ie112904cd64935628ef65942032f2d4be3e2d2a3 GitHub: https://github.com/wikimedia/mediawiki-vagrant/pull/3 --- M puppet/manifests/roles.pp M puppet/manifests/site.pp 2 files changed, 54 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp index 98b06b6..4f75306 100644 --- a/puppet/manifests/roles.pp +++ b/puppet/manifests/roles.pp @@ -199,6 +199,57 @@ } } +# == Class: role::wikieditor +# Configures WikiEditor, an extension which enable an extendable editing +# toolbar and interface +class role::wikieditor { + @mediawiki::extension { 'WikiEditor': + settings => [ + '$wgDefaultUserOptions["usebetatoolbar"] = 1', + '$wgDefaultUserOptions["usebetatoolbar-cgd"] = 1', + '$wgDefaultUserOptions["wikieditor-preview"] = 1', + '$wgDefaultUserOptions["wikieditor-publish"] = 1', + ], + } +} + +# == Class: role::proofreadpage +# Configures ProodreadPage, an extension to allow the proofreading of a text +# in comparison with scanned images. +class role::proofreadpage { + include role::mediawiki + + php::ini { 'proofreadpage': + settings => { + 'upload_max_filesize' => '50M', + 'post_max_size' => '50M', + }, + } + + $packages = [ 'djvulibre-bin', 'ghostscript', 'netpbm' ] + package { $packages: } + + $extras = [ 'LabeledSectionTransclusion', 'ParserFunctions', 'Cite' ] + @mediawiki::extension { $extras: } + + @mediawiki::extension { 'ProofreadPage': + needs_update => true, + settings => [ + '$wgEnableUploads = true', + '$wgFileExtensions = array_merge( $wgFileExtensions, array(\'pdf\', \'djvu\') )', + '$wgMaxShellMemory = 300000', + '$wgDjvuDump = "djvudump"', + '$wgDjvuRenderer = "ddjvu"', + '$wgDjvuTxt = "djvutxt"', + '$wgDjvuPostProcessor = "ppmtojpeg"', + '$wgDjvuOutputExtension = "jpg"', + ], + require => [ + Package[$packages], + Mediawiki::Extension[$extras], + ], + } +} # == Class: role::remote_debug # This class enables support for remote debugging of PHP code using diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 8a06482..a902394 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -11,7 +11,7 @@ # knows how to configure a machine to fulfill various other roles which # are not enabled by default. # -# To enable an optional role, simply uncomment its delcaration below by +# To enable an optional role, simply uncomment its declaration below by # removing the leading '#' symbol and saving this file. Then, run # 'vagrant up' to ensure your machine is active, and then 'vagrant # provision' to apply the updated configuration to your instance. @@ -24,6 +24,8 @@ include role::mediawiki # include role::scribunto + # include role::wikieditor + # include role::proofreadpage # include role::uploadwizard # include role::visualeditor # include role::browsertests -- To view, visit https://gerrit.wikimedia.org/r/68141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie112904cd64935628ef65942032f2d4be3e2d2a3 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: SuchABot <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Zaran <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
