aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--etc/Wire.profile6
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/wire-desktop.profile (renamed from etc/wire.profile)22
-rw-r--r--src/firecfg/firecfg.config3
5 files changed, 16 insertions, 17 deletions
diff --git a/README b/README
index 40d154184..b7687b494 100644
--- a/README
+++ b/README
@@ -314,6 +314,7 @@ Jean Lucas (https://github.com/flacks)
314 - fixes for tor-browser-* profiles 314 - fixes for tor-browser-* profiles
315 - alias for riot-desktop 315 - alias for riot-desktop
316 - add gnome-mpv profile 316 - add gnome-mpv profile
317 - fix wire profile
317Jericho (https://github.com/attritionorg) 318Jericho (https://github.com/attritionorg)
318 - spelling 319 - spelling
319Jesse Smith (https://github.com/slicer69) 320Jesse Smith (https://github.com/slicer69)
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 @@
1# Firejail profile alias for wire
2# This file is overwritten after every install/update
3
4
5# Redirect
6include /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
229blacklist ${HOME}/.config/vivaldi-snapshot 229blacklist ${HOME}/.config/vivaldi-snapshot
230blacklist ${HOME}/.config/vlc 230blacklist ${HOME}/.config/vlc
231blacklist ${HOME}/.config/wesnoth 231blacklist ${HOME}/.config/wesnoth
232blacklist ${HOME}/.config/wire
233blacklist ${HOME}/.config/wireshark 232blacklist ${HOME}/.config/wireshark
234blacklist ${HOME}/.config/xchat 233blacklist ${HOME}/.config/xchat
235blacklist ${HOME}/.config/xed 234blacklist ${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 @@
1# Firejail profile for wire 1# Firejail profile for wire-desktop
2# This file is overwritten after every install/update 2# This file is overwritten after every install/update
3# Persistent local customizations 3# Persistent local customizations
4include /etc/firejail/wire.local 4include /etc/firejail/wire-desktop.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6include /etc/firejail/globals.local
7 7
8# Note: the current beta version of wire is located in /opt/Wire/wire and therefore not in PATH.
9# To use wire with firejail run "firejail /opt/Wire/wire"
10
11noblacklist ${HOME}/.config/Wire 8noblacklist ${HOME}/.config/Wire
12noblacklist ${HOME}/.config/wire
13 9
14include /etc/firejail/disable-common.inc 10include /etc/firejail/disable-common.inc
15include /etc/firejail/disable-devel.inc 11include /etc/firejail/disable-devel.inc
@@ -17,6 +13,12 @@ include /etc/firejail/disable-interpreters.inc
17include /etc/firejail/disable-passwdmgr.inc 13include /etc/firejail/disable-passwdmgr.inc
18include /etc/firejail/disable-programs.inc 14include /etc/firejail/disable-programs.inc
19 15
16mkdir ${HOME}/.config/Wire
17whitelist ${HOME}/.config/Wire
18whitelist ${DOWNLOADS}
19
20include /etc/firejail/whitelist-common.inc
21
20caps.drop all 22caps.drop all
21netfilter 23netfilter
22nodvd 24nodvd
@@ -28,7 +30,11 @@ protocol unix,inet,inet6,netlink
28seccomp 30seccomp
29shell none 31shell none
30 32
31disable-mnt 33# Note: The current version of Wire is located in /opt/wire-desktop/wire-desktop, and therefore
32private-cache 34# it is not in PATH. To use Wire with firejail, run "firejail /opt/wire-desktop/wire-desktop"
35
36private-bin wire-desktop
33private-dev 37private-dev
38private-etc fonts,machine-id
39disable-mnt
34private-tmp 40private-tmp
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index f124c1465..718c2f973 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -15,7 +15,6 @@ Natron
15Telegram 15Telegram
16Viber 16Viber
17VirtualBox 17VirtualBox
18Wire
19Xephyr 18Xephyr
20XMind 19XMind
21abrowser 20abrowser
@@ -435,7 +434,7 @@ weechat-curses
435wesnoth 434wesnoth
436wget 435wget
437wine 436wine
438wire 437wire-desktop
439wireshark 438wireshark
440wireshark-gtk 439wireshark-gtk
441wireshark-qt 440wireshark-qt