[MediaWiki-commits] [Gerrit] Update role::geshi for I07446ec98 - change (mediawiki/vagrant)

2015-06-22 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Update role::geshi for I07446ec98
..


Update role::geshi for I07446ec98

* Depend on python-pygments package.
* Configure $wgPygmentizePath

Change-Id: I3cfbc57a1e9845c5b74e37f50c978330bee84664
---
M puppet/modules/role/manifests/geshi.pp
1 file changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Gilles: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/modules/role/manifests/geshi.pp 
b/puppet/modules/role/manifests/geshi.pp
index 2d2a365..692ffc6 100644
--- a/puppet/modules/role/manifests/geshi.pp
+++ b/puppet/modules/role/manifests/geshi.pp
@@ -1,5 +1,11 @@
 # == Class: role::geshi
 # Configures SyntaxHighlight_GeSHi, an extension for syntax-highlighting
 class role::geshi {
-mediawiki::extension { 'SyntaxHighlight_GeSHi': }
+require_package('python-pygments')
+
+mediawiki::extension { 'SyntaxHighlight_GeSHi':
+settings = {
+wgPygmentizePath = '/usr/local/bin/pygmentize',
+},
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3cfbc57a1e9845c5b74e37f50c978330bee84664
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update role::geshi for I07446ec98 - change (mediawiki/vagrant)

2015-06-19 Thread Ori.livneh (Code Review) 
Ori.livneh has uploaded a new change for review.

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

Change subject: Update role::geshi for I07446ec98
..

Update role::geshi for I07446ec98

* Depend on python-pygments package.
* Configure $wgPygmentizePath

Change-Id: I3cfbc57a1e9845c5b74e37f50c978330bee84664
---
M puppet/modules/role/manifests/geshi.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/97/219497/1

diff --git a/puppet/modules/role/manifests/geshi.pp 
b/puppet/modules/role/manifests/geshi.pp
index 2d2a365..692ffc6 100644
--- a/puppet/modules/role/manifests/geshi.pp
+++ b/puppet/modules/role/manifests/geshi.pp
@@ -1,5 +1,11 @@
 # == Class: role::geshi
 # Configures SyntaxHighlight_GeSHi, an extension for syntax-highlighting
 class role::geshi {
-mediawiki::extension { 'SyntaxHighlight_GeSHi': }
+require_package('python-pygments')
+
+mediawiki::extension { 'SyntaxHighlight_GeSHi':
+settings = {
+wgPygmentizePath = '/usr/local/bin/pygmentize',
+},
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cfbc57a1e9845c5b74e37f50c978330bee84664
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh o...@wikimedia.org

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