[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki: Remove Score firejail wrappers

2017-12-12 Thread Muehlenhoff (Code Review) 
Muehlenhoff has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394914 )

Change subject: mediawiki: Remove Score firejail wrappers
..


mediawiki: Remove Score firejail wrappers

firejailing is now implemented in MediaWiki/Score itself.

Bug: T181535
Depends-On: I481d7918d53569d47e30f169a2ad72ed29fb3b87
Change-Id: I6701c5976311ebf37c934ae222159ff4600e10c3
---
D modules/mediawiki/files/mediawiki-firejail-abc2ly
D modules/mediawiki/files/mediawiki-firejail-lilypond
D modules/mediawiki/files/mediawiki-firejail-timidity
M modules/mediawiki/manifests/init.pp
4 files changed, 0 insertions(+), 36 deletions(-)

Approvals:
  Muehlenhoff: Looks good to me, approved
  Legoktm: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/mediawiki/files/mediawiki-firejail-abc2ly 
b/modules/mediawiki/files/mediawiki-firejail-abc2ly
deleted file mode 100644
index 3b12f2a..000
--- a/modules/mediawiki/files/mediawiki-firejail-abc2ly
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/abc2ly'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/files/mediawiki-firejail-lilypond 
b/modules/mediawiki/files/mediawiki-firejail-lilypond
deleted file mode 100755
index 69e3ff2..000
--- a/modules/mediawiki/files/mediawiki-firejail-lilypond
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', '--quiet', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/lilypond'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/files/mediawiki-firejail-timidity 
b/modules/mediawiki/files/mediawiki-firejail-timidity
deleted file mode 100644
index ebb6fa6..000
--- a/modules/mediawiki/files/mediawiki-firejail-timidity
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/timidity'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index f56bebc..e8d29aa 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -62,27 +62,6 @@
 mode   => '0555',
 }
 
-file { '/usr/local/bin/mediawiki-firejail-lilypond':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-lilypond',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
-file { '/usr/local/bin/mediawiki-firejail-abc2ly':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-abc2ly',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
-file { '/usr/local/bin/mediawiki-firejail-timidity':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-timidity',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
 # /var/log/mediawiki contains log files for the MediaWiki jobrunner
 # and for various periodic jobs that are managed by cron.
 file { '/var/log/mediawiki':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6701c5976311ebf37c934ae222159ff4600e10c3
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Muehlenhoff 
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/puppet[production]: mediawiki: Remove Score firejail wrappers

2017-12-03 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394914 )

Change subject: mediawiki: Remove Score firejail wrappers
..

mediawiki: Remove Score firejail wrappers

firejailing is now implemented in MediaWiki/Score itself.

Depends-On: I481d7918d53569d47e30f169a2ad72ed29fb3b87
Change-Id: I6701c5976311ebf37c934ae222159ff4600e10c3
---
D modules/mediawiki/files/mediawiki-firejail-abc2ly
D modules/mediawiki/files/mediawiki-firejail-lilypond
D modules/mediawiki/files/mediawiki-firejail-timidity
M modules/mediawiki/manifests/init.pp
4 files changed, 0 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/394914/1

diff --git a/modules/mediawiki/files/mediawiki-firejail-abc2ly 
b/modules/mediawiki/files/mediawiki-firejail-abc2ly
deleted file mode 100644
index 3b12f2a..000
--- a/modules/mediawiki/files/mediawiki-firejail-abc2ly
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/abc2ly'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/files/mediawiki-firejail-lilypond 
b/modules/mediawiki/files/mediawiki-firejail-lilypond
deleted file mode 100755
index 69e3ff2..000
--- a/modules/mediawiki/files/mediawiki-firejail-lilypond
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', '--quiet', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/lilypond'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/files/mediawiki-firejail-timidity 
b/modules/mediawiki/files/mediawiki-firejail-timidity
deleted file mode 100644
index ebb6fa6..000
--- a/modules/mediawiki/files/mediawiki-firejail-timidity
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/python
-# -*- coding: utf-8 -*-
-
-import sys, subprocess
-subprocess.call(['/usr/bin/firejail', 
'--profile=/etc/firejail/mediawiki-converters.profile', '/usr/bin/timidity'] + 
sys.argv[1:])
diff --git a/modules/mediawiki/manifests/init.pp 
b/modules/mediawiki/manifests/init.pp
index f56bebc..e8d29aa 100644
--- a/modules/mediawiki/manifests/init.pp
+++ b/modules/mediawiki/manifests/init.pp
@@ -62,27 +62,6 @@
 mode   => '0555',
 }
 
-file { '/usr/local/bin/mediawiki-firejail-lilypond':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-lilypond',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
-file { '/usr/local/bin/mediawiki-firejail-abc2ly':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-abc2ly',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
-file { '/usr/local/bin/mediawiki-firejail-timidity':
-source => 'puppet:///modules/mediawiki/mediawiki-firejail-timidity',
-owner  => 'root',
-group  => 'root',
-mode   => '0555',
-}
-
 # /var/log/mediawiki contains log files for the MediaWiki jobrunner
 # and for various periodic jobs that are managed by cron.
 file { '/var/log/mediawiki':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6701c5976311ebf37c934ae222159ff4600e10c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Legoktm 

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