jenkins-bot has submitted this change and it was merged. Change subject: Add Scribunto role ......................................................................
Add Scribunto role This change adds a Scribunto role which configures the Scribunto extension with LuaSandbox as its default engine. Change-Id: I88e0f8fb87082d15009a64e387dddc2a6a2ea7f5 --- M puppet/manifests/roles.pp M puppet/manifests/site.pp 2 files changed, 35 insertions(+), 9 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp index d96f034..d770d07 100644 --- a/puppet/manifests/roles.pp +++ b/puppet/manifests/roles.pp @@ -66,7 +66,7 @@ class role::eventlogging { include role::mediawiki - mediawiki::extension { 'EventLogging': + @mediawiki::extension { 'EventLogging': priority => 5, settings => { # Work with production schemas but log locally: @@ -85,7 +85,7 @@ include role::mediawiki include role::eventlogging - mediawiki::extension { 'MobileFrontend': + @mediawiki::extension { 'MobileFrontend': settings => { wgMFForceSecureLogin => false, wgMFLogEvents => true, @@ -101,7 +101,7 @@ class { 'redis': } - mediawiki::extension { 'GettingStarted': + @mediawiki::extension { 'GettingStarted': settings => { wgGettingStartedRedis => '127.0.0.1', }, @@ -114,7 +114,7 @@ include role::mediawiki include role::eventlogging - mediawiki::extension { 'Echo': + @mediawiki::extension { 'Echo': needs_update => true, settings => { wgEchoEnableEmailBatch => false, @@ -129,7 +129,7 @@ include role::mediawiki class { '::mediawiki::parsoid': } - mediawiki::extension { 'VisualEditor': + @mediawiki::extension { 'VisualEditor': settings => template('ve-config.php.erb'), } } @@ -159,11 +159,9 @@ class role::uploadwizard { include role::mediawiki - package { 'imagemagick': - ensure => present, - } + package { 'imagemagick': } - mediawiki::extension { 'UploadWizard': + @mediawiki::extension { 'UploadWizard': require => Package['imagemagick'], settings => { wgEnableUploads => true, @@ -173,3 +171,30 @@ }, } } + + +# == Class: role::scribunto +# Configures Scribunto, an extension for embedding scripting languages +# in MediaWiki. +class role::scribunto { + include role::mediawiki + + $extras = [ 'CodeEditor', 'WikiEditor', 'SyntaxHighlight_GeSHi' ] + @mediawiki::extension { $extras: } + + package { 'php-luasandbox': + notify => Service['apache2'], + } + + @mediawiki::extension { 'Scribunto': + settings => { + wgScribuntoDefaultEngine => 'luasandbox', + wgScribuntoUseGeSHi => true, + wgScribuntoUseCodeEditor => true, + }, + require => [ + Package['php-luasandbox'], + Mediawiki::Extension[$extras], + ], + } +} diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 8aae060..e9031b8 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -23,6 +23,7 @@ node 'mediawiki-vagrant' { include role::mediawiki + # include role::scribunto # include role::uploadwizard # include role::visualeditor # include role::browsertests -- To view, visit https://gerrit.wikimedia.org/r/65775 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I88e0f8fb87082d15009a64e387dddc2a6a2ea7f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits