diff options
author | 2020-12-29 22:44:09 +0100 | |
---|---|---|
committer | 2020-12-29 22:44:09 +0100 | |
commit | a91e35cf66a8c333be8991620628e021aa8f3e33 (patch) | |
tree | eb1233df79a2f4b850d7cd45ca9c4ba7706d7b29 /etc | |
parent | profiles: add redirect from matrix-mirage to mirage (#3854) (diff) | |
parent | Put a comment about dbus rules and comment them (diff) | |
download | firejail-a91e35cf66a8c333be8991620628e021aa8f3e33.tar.gz firejail-a91e35cf66a8c333be8991620628e021aa8f3e33.tar.zst firejail-a91e35cf66a8c333be8991620628e021aa8f3e33.zip |
Merge pull request #3847 from bbhtt/small_fixes
Small fixes
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/disable-programs.inc | 2 | ||||
-rw-r--r-- | etc/profile-a-l/alacarte.profile | 2 | ||||
-rw-r--r-- | etc/profile-a-l/element-desktop.profile | 5 | ||||
-rw-r--r-- | etc/profile-a-l/feh.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/links.profile | 1 | ||||
-rw-r--r-- | etc/profile-a-l/lynx.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/nheko.profile | 18 | ||||
-rw-r--r-- | etc/profile-m-z/spectral.profile | 4 |
8 files changed, 30 insertions, 4 deletions
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc index 7df40c705..961437ad7 100644 --- a/etc/inc/disable-programs.inc +++ b/etc/inc/disable-programs.inc | |||
@@ -961,7 +961,7 @@ blacklist ${HOME}/.cache/ms-skype-online | |||
961 | blacklist ${HOME}/.cache/ms-word-online | 961 | blacklist ${HOME}/.cache/ms-word-online |
962 | blacklist ${HOME}/.cache/mutt | 962 | blacklist ${HOME}/.cache/mutt |
963 | blacklist ${HOME}/.cache/mypaint | 963 | blacklist ${HOME}/.cache/mypaint |
964 | blacklist ${HOME}/.cache/nheko/nheko | 964 | blacklist ${HOME}/.cache/nheko |
965 | blacklist ${HOME}/.cache/netsurf | 965 | blacklist ${HOME}/.cache/netsurf |
966 | blacklist ${HOME}/.cache/okular | 966 | blacklist ${HOME}/.cache/okular |
967 | blacklist ${HOME}/.cache/opera | 967 | blacklist ${HOME}/.cache/opera |
diff --git a/etc/profile-a-l/alacarte.profile b/etc/profile-a-l/alacarte.profile index 8f7640ffe..98188d2a7 100644 --- a/etc/profile-a-l/alacarte.profile +++ b/etc/profile-a-l/alacarte.profile | |||
@@ -49,7 +49,7 @@ shell none | |||
49 | tracelog | 49 | tracelog |
50 | 50 | ||
51 | disable-mnt | 51 | disable-mnt |
52 | private-bin alacarte,bash,python*,sh | 52 | # private-bin alacarte,bash,python*,sh |
53 | private-cache | 53 | private-cache |
54 | private-dev | 54 | private-dev |
55 | private-etc alternatives,dconf,fonts,gtk-3.0,locale.alias,locale.conf,login.defs,mime.types,nsswitch.conf,passwd,pki,X11,xdg | 55 | private-etc alternatives,dconf,fonts,gtk-3.0,locale.alias,locale.conf,login.defs,mime.types,nsswitch.conf,passwd,pki,X11,xdg |
diff --git a/etc/profile-a-l/element-desktop.profile b/etc/profile-a-l/element-desktop.profile index 2d56369cd..48a826f2e 100644 --- a/etc/profile-a-l/element-desktop.profile +++ b/etc/profile-a-l/element-desktop.profile | |||
@@ -7,6 +7,8 @@ include element-desktop.local | |||
7 | # added by included profile | 7 | # added by included profile |
8 | #include globals.local | 8 | #include globals.local |
9 | 9 | ||
10 | ignore dbus-user none | ||
11 | |||
10 | noblacklist ${HOME}/.config/Element | 12 | noblacklist ${HOME}/.config/Element |
11 | 13 | ||
12 | mkdir ${HOME}/.config/Element | 14 | mkdir ${HOME}/.config/Element |
@@ -15,5 +17,8 @@ whitelist /opt/Element | |||
15 | 17 | ||
16 | private-opt Element | 18 | private-opt Element |
17 | 19 | ||
20 | dbus-user filter | ||
21 | dbus-user.talk org.freedesktop.secrets | ||
22 | |||
18 | # Redirect | 23 | # Redirect |
19 | include riot-desktop.profile | 24 | include riot-desktop.profile |
diff --git a/etc/profile-a-l/feh.profile b/etc/profile-a-l/feh.profile index 3ee07e559..8ac7755de 100644 --- a/etc/profile-a-l/feh.profile +++ b/etc/profile-a-l/feh.profile | |||
@@ -1,6 +1,7 @@ | |||
1 | # Firejail profile for feh | 1 | # Firejail profile for feh |
2 | # Description: imlib2 based image viewer | 2 | # Description: imlib2 based image viewer |
3 | # This file is overwritten after every install/update | 3 | # This file is overwritten after every install/update |
4 | quiet | ||
4 | # Persistent local customizations | 5 | # Persistent local customizations |
5 | include feh.local | 6 | include feh.local |
6 | # Persistent global definitions | 7 | # Persistent global definitions |
diff --git a/etc/profile-a-l/links.profile b/etc/profile-a-l/links.profile index b2f94d3cf..ccc77f274 100644 --- a/etc/profile-a-l/links.profile +++ b/etc/profile-a-l/links.profile | |||
@@ -1,6 +1,7 @@ | |||
1 | # Firejail profile for links | 1 | # Firejail profile for links |
2 | # Description: Text WWW browser | 2 | # Description: Text WWW browser |
3 | # This file is overwritten after every install/update | 3 | # This file is overwritten after every install/update |
4 | quiet | ||
4 | # Persistent local customizations | 5 | # Persistent local customizations |
5 | include links.local | 6 | include links.local |
6 | # Persistent global definitions | 7 | # Persistent global definitions |
diff --git a/etc/profile-a-l/lynx.profile b/etc/profile-a-l/lynx.profile index dbd0a61e5..76a0e7ed0 100644 --- a/etc/profile-a-l/lynx.profile +++ b/etc/profile-a-l/lynx.profile | |||
@@ -1,6 +1,7 @@ | |||
1 | # Firejail profile for lynx | 1 | # Firejail profile for lynx |
2 | # Description: Classic non-graphical (text-mode) web browser | 2 | # Description: Classic non-graphical (text-mode) web browser |
3 | # This file is overwritten after every install/update | 3 | # This file is overwritten after every install/update |
4 | quiet | ||
4 | # Persistent local customizations | 5 | # Persistent local customizations |
5 | include lynx.local | 6 | include lynx.local |
6 | # Persistent global definitions | 7 | # Persistent global definitions |
diff --git a/etc/profile-m-z/nheko.profile b/etc/profile-m-z/nheko.profile index 701098f4b..42e7e92fc 100644 --- a/etc/profile-m-z/nheko.profile +++ b/etc/profile-m-z/nheko.profile | |||
@@ -7,7 +7,7 @@ include nheko.local | |||
7 | include globals.local | 7 | include globals.local |
8 | 8 | ||
9 | noblacklist ${HOME}/.config/nheko | 9 | noblacklist ${HOME}/.config/nheko |
10 | noblacklist ${HOME}/.cache/nheko/nheko | 10 | noblacklist ${HOME}/.cache/nheko |
11 | 11 | ||
12 | include disable-common.inc | 12 | include disable-common.inc |
13 | include disable-devel.inc | 13 | include disable-devel.inc |
@@ -16,14 +16,19 @@ include disable-interpreters.inc | |||
16 | include disable-passwdmgr.inc | 16 | include disable-passwdmgr.inc |
17 | include disable-programs.inc | 17 | include disable-programs.inc |
18 | include disable-shell.inc | 18 | include disable-shell.inc |
19 | include disable-xdg.inc | ||
19 | 20 | ||
20 | mkdir ${HOME}/.config/nheko | 21 | mkdir ${HOME}/.config/nheko |
21 | mkdir ${HOME}/.cache/nheko/nheko | 22 | mkdir ${HOME}/.cache/nheko/nheko |
22 | whitelist ${HOME}/.config/nheko | 23 | whitelist ${HOME}/.config/nheko |
23 | whitelist ${HOME}/.cache/nheko/nheko | 24 | whitelist ${HOME}/.cache/nheko |
24 | whitelist ${DOWNLOADS} | 25 | whitelist ${DOWNLOADS} |
25 | include whitelist-common.inc | 26 | include whitelist-common.inc |
27 | include whitelist-runuser-common.inc | ||
28 | include whitelist-usr-share-common.inc | ||
29 | include whitelist-var-common.inc | ||
26 | 30 | ||
31 | apparmor | ||
27 | caps.drop all | 32 | caps.drop all |
28 | netfilter | 33 | netfilter |
29 | nodvd | 34 | nodvd |
@@ -38,5 +43,14 @@ tracelog | |||
38 | 43 | ||
39 | disable-mnt | 44 | disable-mnt |
40 | private-bin nheko | 45 | private-bin nheko |
46 | private-cache | ||
47 | private-dev | ||
48 | private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,gtk-2.0,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,mime.types,nsswitch.conf,pki,pulse,resolv.conf,selinux,ssl,X11,xdg | ||
41 | private-tmp | 49 | private-tmp |
42 | 50 | ||
51 | dbus-user none | ||
52 | # Comment the above line and uncomment below lines for notification popups | ||
53 | # dbus-user filter | ||
54 | # dbus-user.talk org.freedesktop.Notifications | ||
55 | # dbus-user.talk org.kde.StatusNotifierWatcher | ||
56 | dbus-system none | ||
diff --git a/etc/profile-m-z/spectral.profile b/etc/profile-m-z/spectral.profile index 66e917432..093661d8c 100644 --- a/etc/profile-m-z/spectral.profile +++ b/etc/profile-m-z/spectral.profile | |||
@@ -50,4 +50,8 @@ private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts, | |||
50 | private-tmp | 50 | private-tmp |
51 | 51 | ||
52 | dbus-user none | 52 | dbus-user none |
53 | # Comment the above line and uncomment below lines for notification popups | ||
54 | # dbus-user filter | ||
55 | # dbus-user.talk org.freedesktop.Notifications | ||
56 | # dbus-user.talk org.kde.StatusNotifierWatcher | ||
53 | dbus-system none | 57 | dbus-system none |