Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403212 )
Change subject: Remove firejail config for now-unused ffmpeg2theora
......................................................................
Remove firejail config for now-unused ffmpeg2theora
ffmpeg2theora is no longer used in production, don't need a firejail
config for it.
Bug: T181591
Change-Id: Ic21d2759b3b0f161b3206510418f60fd3a598744
---
D modules/mediawiki/files/mediawiki-firejail-ffmpeg2theora
M modules/mediawiki/manifests/firejail.pp
2 files changed, 0 insertions(+), 12 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/mediawiki-firejail-ffmpeg2theora
b/modules/mediawiki/files/mediawiki-firejail-ffmpeg2theora
deleted file mode 100755
index 7c5dfd1..0000000
--- a/modules/mediawiki/files/mediawiki-firejail-ffmpeg2theora
+++ /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/ffmpeg2theora'] + sys.argv[1:])
diff --git a/modules/mediawiki/manifests/firejail.pp
b/modules/mediawiki/manifests/firejail.pp
index 449ff93..a3d9c9d 100644
--- a/modules/mediawiki/manifests/firejail.pp
+++ b/modules/mediawiki/manifests/firejail.pp
@@ -14,13 +14,6 @@
mode => '0555',
}
- file { '/usr/local/bin/mediawiki-firejail-ffmpeg2theora':
- source =>
'puppet:///modules/mediawiki/mediawiki-firejail-ffmpeg2theora',
- owner => 'root',
- group => 'root',
- mode => '0555',
- }
-
file { '/usr/local/bin/mediawiki-firejail-rsvg-convert':
source =>
'puppet:///modules/mediawiki/mediawiki-firejail-rsvg-convert',
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/403212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic21d2759b3b0f161b3206510418f60fd3a598744
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
