merged Amend Wire profiles #1998 form @flacks

3 files changed, 14 insertions, 15 deletions

diff --git a/etc/Wire.profile b/etc/Wire.profile
deleted file mode 100644
index 26b683f84..000000000
--- a/etc/Wire.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Firejail profile alias for wire
-# This file is overwritten after every install/update
-
-
-# Redirect
-include /etc/firejail/wire.profile
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index ce27116ba..f72b5a5c3 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -229,7 +229,6 @@ blacklist ${HOME}/.config/vivaldi
 blacklist ${HOME}/.config/vivaldi-snapshot
 blacklist ${HOME}/.config/vlc
 blacklist ${HOME}/.config/wesnoth
-blacklist ${HOME}/.config/wire
 blacklist ${HOME}/.config/wireshark
 blacklist ${HOME}/.config/xchat
 blacklist ${HOME}/.config/xed
diff --git a/etc/wire.profile b/etc/wire-desktop.profile
index 86ebca33d..74d44efe3 100644
--- a/etc/wire.profile
+++ b/etc/wire-desktop.profile
@@ -1,15 +1,11 @@
-# Firejail profile for wire
+# Firejail profile for wire-desktop
 # This file is overwritten after every install/update
 # Persistent local customizations
-include /etc/firejail/wire.local
+include /etc/firejail/wire-desktop.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
-# Note: the current beta version of wire is located in /opt/Wire/wire and therefore not in PATH.
-# To use wire with firejail run "firejail /opt/Wire/wire"
-
 noblacklist ${HOME}/.config/Wire
-noblacklist ${HOME}/.config/wire
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
@@ -17,6 +13,12 @@ include /etc/firejail/disable-interpreters.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
+mkdir ${HOME}/.config/Wire
+whitelist ${HOME}/.config/Wire
+whitelist ${DOWNLOADS}
+
+include /etc/firejail/whitelist-common.inc
+
 caps.drop all
 netfilter
 nodvd
@@ -28,7 +30,11 @@ protocol unix,inet,inet6,netlink
 seccomp
 shell none
 
-disable-mnt
-private-cache
+# Note: The current version of Wire is located in /opt/wire-desktop/wire-desktop, and therefore
+# it is not in PATH. To use Wire with firejail, run "firejail /opt/wire-desktop/wire-desktop"
+
+private-bin wire-desktop
 private-dev
+private-etc fonts,machine-id
+disable-mnt
 private-tmp