Merge pull request #2481 from rusty-snake/gnome-mpv_to_celluloid

gnome-mpv -> celluloid

3 files changed, 55 insertions, 43 deletions

diff --git a/etc/celluloid.profile b/etc/celluloid.profile
new file mode 100644
index 000000000..1f61ff9f5
--- /dev/null
+++ b/etc/celluloid.profile
@@ -0,0 +1,51 @@
+# Firejail profile for celluloid
+# Description: Simple GTK+ frontend for mpv
+# This file is overwritten after every install/update
+# Persistent local customizations
+include celluloid.local
+# Persistent global definitions
+include globals.local
+
+noblacklist ${HOME}/.config/gnome-mpv
+noblacklist ${HOME}/.config/celluloid
+noblacklist ${MUSIC}
+noblacklist ${VIDEOS}
+
+# Allow python (blacklisted by disable-interpreters.inc)
+noblacklist ${PATH}/python2*
+noblacklist ${PATH}/python3*
+noblacklist /usr/lib/python2*
+noblacklist /usr/lib/python3*
+noblacklist /usr/local/lib/python2*
+noblacklist /usr/local/lib/python3*
+
+include disable-common.inc
+include disable-devel.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+
+include whitelist-var-common.inc
+
+apparmor
+caps.drop all
+netfilter
+nodbus
+nogroups
+nonewprivs
+noroot
+nou2f
+protocol unix,inet,inet6
+seccomp
+shell none
+tracelog
+
+private-bin celluloid,gnome-mpv,youtube-dl,python*,env
+private-cache
+private-etc alternatives,ca-certificates,ssl,pki,pkcs11,hosts,machine-id,localtime,libva.conf,drirc,fonts,gtk-3.0,dconf,crypto-policies,xdg,selinux,resolv.conf
+private-dev
+private-tmp
+
+noexec ${HOME}
+noexec /tmp
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 077c2d070..2df014cf3 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -117,6 +117,7 @@ blacklist ${HOME}/.config/brave
 blacklist ${HOME}/.config/caja
 blacklist ${HOME}/.config/calibre
 blacklist ${HOME}/.config/catfish
+blacklist ${HOME}/.config/celluloid
 blacklist ${HOME}/.config/cherrytree
 blacklist ${HOME}/.config/chromium
 blacklist ${HOME}/.config/chromium-dev
diff --git a/etc/gnome-mpv.profile b/etc/gnome-mpv.profile
index 9bac59caf..f5d652732 100644
--- a/etc/gnome-mpv.profile
+++ b/etc/gnome-mpv.profile
@@ -1,45 +1,5 @@
-# Firejail profile for gnome-mpv
-# Description: Simple GTK+ frontend for mpv
+# Firejail profile alias for celluloid (formerly GNOME MPV)
 # This file is overwritten after every install/update
-# Persistent local customizations
-include gnome-mpv.local
-# Persistent global definitions
-include globals.local
 
-noblacklist ${HOME}/.config/gnome-mpv
-noblacklist ${MUSIC}
-noblacklist ${VIDEOS}
-
-# Allow python (blacklisted by disable-interpreters.inc)
-noblacklist ${PATH}/python2*
-noblacklist ${PATH}/python3*
-noblacklist /usr/lib/python2*
-noblacklist /usr/lib/python3*
-noblacklist /usr/local/lib/python2*
-noblacklist /usr/local/lib/python3*
-
-include disable-common.inc
-include disable-devel.inc
-include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
-include disable-xdg.inc
-
-include whitelist-var-common.inc
-
-caps.drop all
-nodbus
-nogroups
-nonewprivs
-noroot
-nou2f
-protocol unix,inet,inet6
-seccomp
-shell none
-
-private-bin gnome-mpv,youtube-dl,python*,env
-private-dev
-private-tmp
-
-noexec ${HOME}
-noexec /tmp
+# Redirect
+include celluloid.profile