diff options
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | etc/Wire.profile | 6 | ||||
-rw-r--r-- | etc/disable-programs.inc | 1 | ||||
-rw-r--r-- | etc/wire-desktop.profile (renamed from etc/wire.profile) | 22 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 3 |
5 files changed, 16 insertions, 17 deletions
@@ -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 | ||
317 | Jericho (https://github.com/attritionorg) | 318 | Jericho (https://github.com/attritionorg) |
318 | - spelling | 319 | - spelling |
319 | Jesse Smith (https://github.com/slicer69) | 320 | Jesse 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 | ||
6 | 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 | |||
229 | blacklist ${HOME}/.config/vivaldi-snapshot | 229 | blacklist ${HOME}/.config/vivaldi-snapshot |
230 | blacklist ${HOME}/.config/vlc | 230 | blacklist ${HOME}/.config/vlc |
231 | blacklist ${HOME}/.config/wesnoth | 231 | blacklist ${HOME}/.config/wesnoth |
232 | blacklist ${HOME}/.config/wire | ||
233 | blacklist ${HOME}/.config/wireshark | 232 | blacklist ${HOME}/.config/wireshark |
234 | blacklist ${HOME}/.config/xchat | 233 | blacklist ${HOME}/.config/xchat |
235 | blacklist ${HOME}/.config/xed | 234 | 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 @@ | |||
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 |
4 | include /etc/firejail/wire.local | 4 | include /etc/firejail/wire-desktop.local |
5 | # Persistent global definitions | 5 | # Persistent global definitions |
6 | include /etc/firejail/globals.local | 6 | include /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 | |||
11 | noblacklist ${HOME}/.config/Wire | 8 | noblacklist ${HOME}/.config/Wire |
12 | noblacklist ${HOME}/.config/wire | ||
13 | 9 | ||
14 | include /etc/firejail/disable-common.inc | 10 | include /etc/firejail/disable-common.inc |
15 | include /etc/firejail/disable-devel.inc | 11 | include /etc/firejail/disable-devel.inc |
@@ -17,6 +13,12 @@ include /etc/firejail/disable-interpreters.inc | |||
17 | include /etc/firejail/disable-passwdmgr.inc | 13 | include /etc/firejail/disable-passwdmgr.inc |
18 | include /etc/firejail/disable-programs.inc | 14 | include /etc/firejail/disable-programs.inc |
19 | 15 | ||
16 | mkdir ${HOME}/.config/Wire | ||
17 | whitelist ${HOME}/.config/Wire | ||
18 | whitelist ${DOWNLOADS} | ||
19 | |||
20 | include /etc/firejail/whitelist-common.inc | ||
21 | |||
20 | caps.drop all | 22 | caps.drop all |
21 | netfilter | 23 | netfilter |
22 | nodvd | 24 | nodvd |
@@ -28,7 +30,11 @@ protocol unix,inet,inet6,netlink | |||
28 | seccomp | 30 | seccomp |
29 | shell none | 31 | shell none |
30 | 32 | ||
31 | disable-mnt | 33 | # Note: The current version of Wire is located in /opt/wire-desktop/wire-desktop, and therefore |
32 | private-cache | 34 | # it is not in PATH. To use Wire with firejail, run "firejail /opt/wire-desktop/wire-desktop" |
35 | |||
36 | private-bin wire-desktop | ||
33 | private-dev | 37 | private-dev |
38 | private-etc fonts,machine-id | ||
39 | disable-mnt | ||
34 | private-tmp | 40 | private-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 | |||
15 | Telegram | 15 | Telegram |
16 | Viber | 16 | Viber |
17 | VirtualBox | 17 | VirtualBox |
18 | Wire | ||
19 | Xephyr | 18 | Xephyr |
20 | XMind | 19 | XMind |
21 | abrowser | 20 | abrowser |
@@ -435,7 +434,7 @@ weechat-curses | |||
435 | wesnoth | 434 | wesnoth |
436 | wget | 435 | wget |
437 | wine | 436 | wine |
438 | wire | 437 | wire-desktop |
439 | wireshark | 438 | wireshark |
440 | wireshark-gtk | 439 | wireshark-gtk |
441 | wireshark-qt | 440 | wireshark-qt |