[MediaWiki-commits] [Gerrit] Have EL depend on Geshi, related minor refactoring - change (mediawiki/vagrant)

[Mattflaschen (Code Review)]

Mattflaschen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/84488


Change subject: Have EL depend on Geshi, related minor refactoring
......................................................................

Have EL depend on Geshi, related minor refactoring

Simple new roles for CodeEditor and SyntaxHighlight_Geshi

Change-Id: I8078598b37a314f8db8c955b88c173666a2f6806
---
M puppet/manifests/roles.pp
1 file changed, 23 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/88/84488/1

diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 44f362c..cb91fea 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -130,6 +130,7 @@
 # events are validated against production schemas but logged locally.
 class role::eventlogging {
     include role::mediawiki
+    include role::syntaxhighlight_geshi
 
     @mediawiki::extension { 'EventLogging':
         priority => 5,
@@ -230,6 +231,14 @@
     class { '::user_metrics': }
 }
 
+# == Class: role::codeeditor
+# Configures the extension for code editing
+class role::codeeditor {
+    include role::mediawiki
+
+    @mediawiki::extension { 'CodeEditor': }
+}
+
 # == Class: role::uploadwizard
 # Configures a MediaWiki instance with UploadWizard, a JavaScript-driven
 # wizard interface for uploading multiple files.
@@ -237,8 +246,10 @@
     include role::mediawiki
     include role::eventlogging
     include role::multimedia
+    include role::codeeditor
+    include role::wikieditor
 
-    @mediawiki::extension { [ 'CodeEditor', 'WikiEditor', 'Campaigns' ]: }
+    @mediawiki::extension { [ 'Campaigns' ]: }
 
     @mediawiki::extension { 'UploadWizard':
         require  => Package['imagemagick'],
@@ -258,16 +269,23 @@
     }
 }
 
+# == Class: role::syntaxhighlight_geshi
+# Configures SyntaxHighlight_GeSHi, an extension for syntax-highlighting
+class role::syntaxhighlight_geshi {
+    include role::mediawiki
+
+    @mediawiki::extension { 'SyntaxHighlight_GeSHi' : }
+}
 
 # == Class: role::scribunto
 # Configures Scribunto, an extension for embedding scripting languages
 # in MediaWiki.
 class role::scribunto {
     include role::mediawiki
+    include role::codeeditor
+    include role::wikieditor
+    include role::syntaxhighlight_geshi
     include packages::php_luasandbox
-
-    $extras = [ 'CodeEditor', 'WikiEditor', 'SyntaxHighlight_GeSHi' ]
-    @mediawiki::extension { $extras: }
 
     @mediawiki::extension { 'Scribunto':
         settings => {
@@ -277,8 +295,7 @@
         },
         notify   => Service['apache2'],
         require  => [
-            Package['php-luasandbox'],
-            Mediawiki::Extension[$extras],
+            Package['php-luasandbox']
         ],
     }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8078598b37a314f8db8c955b88c173666a2f6806
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>

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