[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Run Lilypond from Firejail

2017-08-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370358 )

Change subject: Run Lilypond from Firejail
..


Run Lilypond from Firejail

This change changes the path to the Lilypond executable to a script
provided by Puppet encapsulating it with Firejail.

Bug: T172582
Depends-On: I011db0e9a2d9da825cf3ac02bfba23b562e052f6
Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 05d1eff..fa7af44 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1077,6 +1077,10 @@
 
 if ( $wmgUseScore ) {
wfLoadExtension( 'Score' );
+   $wgScoreSafeMode = true;
+   $wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
+   $wgScoreAbc2Ly = '/usr/local/bin/mediawiki-firejail-abc2ly';
+   $wgScoreTimidity = '/usr/local/bin/mediawiki-firejail-timidity';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
Gerrit-PatchSet: 8
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ebe123 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Run Lilypond from Firejail

2017-08-05 Thread Ebe123 (Code Review) 
Ebe123 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370358 )

Change subject: Run Lilypond from Firejail
..

Run Lilypond from Firejail

This change changes the path to the Lilypond executable to a script
provided by Puppet encapsulating it with Firejail.

Should not be merged until the equivalent puppet patch is merged.

Bug: T171372
Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/58/370358/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 32e6f83..4fa9333 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1068,6 +1068,7 @@
 
 if ( $wmgUseScore ) {
wfLoadExtension( 'Score' );
+   $wgScoreLilypond = '/usr/local/bin/mediawiki-firejail-lilypond';
$wgScoreFileBackend = $wmgScoreFileBackend;
$wgScorePath = $wmgScorePath;
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a0579b0e5adf4b4498cd8663bcb878ef0f34626
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ebe123 

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