diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2023-10-22 23:51:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-22 23:51:12 +0000 |
commit | 2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50 (patch) | |
tree | afa69c65afe9fd9cf2c1a91a4f95e1e65933e73d /etc/profile-m-z | |
parent | contrib/syntax: remove 'text/plain' from firejail-profile.lang.in (#6059) (diff) | |
download | firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.tar.gz firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.tar.zst firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.zip |
profiles: support more msmtp configuration paths (#6060)
Since version 1.8.6 msmtp supports per-user configuration at either
~/.msmtprc (already supported by firejail) or
`$XDG_CONFIG_HOME/msmtp/config`. System-wide support can be placed at
/etc/msmtprc.
This adds the missing paths to the relevant .inc and .profile files.
Note that `blacklist ${HOME}/.msmtprc` is present on both
disable-common.inc and disable-programs.inc, so the new paths are added
to both files.
References:
https://wiki.archlinux.org/title/Msmtp#Basic_setup
https://marlam.de/msmtp/msmtp.html#Configuration-files
Diffstat (limited to 'etc/profile-m-z')
-rw-r--r-- | etc/profile-m-z/mutt.profile | 5 | ||||
-rw-r--r-- | etc/profile-m-z/neomutt.profile | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile index f56c2b1e5..ab1e0ab02 100644 --- a/etc/profile-m-z/mutt.profile +++ b/etc/profile-m-z/mutt.profile | |||
@@ -13,6 +13,7 @@ noblacklist ${DOCUMENTS} | |||
13 | noblacklist ${HOME}/.Mail | 13 | noblacklist ${HOME}/.Mail |
14 | noblacklist ${HOME}/.bogofilter | 14 | noblacklist ${HOME}/.bogofilter |
15 | noblacklist ${HOME}/.cache/mutt | 15 | noblacklist ${HOME}/.cache/mutt |
16 | noblacklist ${HOME}/.config/msmtp | ||
16 | noblacklist ${HOME}/.config/mutt | 17 | noblacklist ${HOME}/.config/mutt |
17 | noblacklist ${HOME}/.config/nano | 18 | noblacklist ${HOME}/.config/nano |
18 | noblacklist ${HOME}/.elinks | 19 | noblacklist ${HOME}/.elinks |
@@ -35,6 +36,7 @@ noblacklist ${HOME}/Mail | |||
35 | noblacklist ${HOME}/mail | 36 | noblacklist ${HOME}/mail |
36 | noblacklist ${HOME}/postponed | 37 | noblacklist ${HOME}/postponed |
37 | noblacklist ${HOME}/sent | 38 | noblacklist ${HOME}/sent |
39 | noblacklist /etc/msmtprc | ||
38 | 40 | ||
39 | blacklist /tmp/.X11-unix | 41 | blacklist /tmp/.X11-unix |
40 | blacklist ${RUNUSER}/wayland-* | 42 | blacklist ${RUNUSER}/wayland-* |
@@ -69,6 +71,7 @@ whitelist ${DOWNLOADS} | |||
69 | whitelist ${HOME}/.Mail | 71 | whitelist ${HOME}/.Mail |
70 | whitelist ${HOME}/.bogofilter | 72 | whitelist ${HOME}/.bogofilter |
71 | whitelist ${HOME}/.cache/mutt | 73 | whitelist ${HOME}/.cache/mutt |
74 | whitelist ${HOME}/.config/msmtp | ||
72 | whitelist ${HOME}/.config/mutt | 75 | whitelist ${HOME}/.config/mutt |
73 | whitelist ${HOME}/.config/nano | 76 | whitelist ${HOME}/.config/nano |
74 | whitelist ${HOME}/.elinks | 77 | whitelist ${HOME}/.elinks |
@@ -124,7 +127,7 @@ tracelog | |||
124 | #disable-mnt | 127 | #disable-mnt |
125 | private-cache | 128 | private-cache |
126 | private-dev | 129 | private-dev |
127 | private-etc @tls-ca,@x11,Mutt,Muttrc,Muttrc.d,gai.conf,gnupg,gnutls,hosts.conf,mail,mailname,nntpserver,terminfo | 130 | private-etc @tls-ca,@x11,msmtprc,Mutt,Muttrc,Muttrc.d,gai.conf,gnupg,gnutls,hosts.conf,mail,mailname,nntpserver,terminfo |
128 | private-tmp | 131 | private-tmp |
129 | writable-run-user | 132 | writable-run-user |
130 | writable-var | 133 | writable-var |
diff --git a/etc/profile-m-z/neomutt.profile b/etc/profile-m-z/neomutt.profile index e028d8d42..b15e98424 100644 --- a/etc/profile-m-z/neomutt.profile +++ b/etc/profile-m-z/neomutt.profile | |||
@@ -10,6 +10,7 @@ include globals.local | |||
10 | noblacklist ${DOCUMENTS} | 10 | noblacklist ${DOCUMENTS} |
11 | noblacklist ${HOME}/.Mail | 11 | noblacklist ${HOME}/.Mail |
12 | noblacklist ${HOME}/.bogofilter | 12 | noblacklist ${HOME}/.bogofilter |
13 | noblacklist ${HOME}/.config/msmtp | ||
13 | noblacklist ${HOME}/.config/mutt | 14 | noblacklist ${HOME}/.config/mutt |
14 | noblacklist ${HOME}/.config/nano | 15 | noblacklist ${HOME}/.config/nano |
15 | noblacklist ${HOME}/.config/neomutt | 16 | noblacklist ${HOME}/.config/neomutt |
@@ -34,6 +35,7 @@ noblacklist ${HOME}/Mail | |||
34 | noblacklist ${HOME}/mail | 35 | noblacklist ${HOME}/mail |
35 | noblacklist ${HOME}/postponed | 36 | noblacklist ${HOME}/postponed |
36 | noblacklist ${HOME}/sent | 37 | noblacklist ${HOME}/sent |
38 | noblacklist /etc/msmtprc | ||
37 | noblacklist /var/mail | 39 | noblacklist /var/mail |
38 | noblacklist /var/spool/mail | 40 | noblacklist /var/spool/mail |
39 | 41 | ||
@@ -59,6 +61,7 @@ whitelist ${DOCUMENTS} | |||
59 | whitelist ${DOWNLOADS} | 61 | whitelist ${DOWNLOADS} |
60 | whitelist ${HOME}/.Mail | 62 | whitelist ${HOME}/.Mail |
61 | whitelist ${HOME}/.bogofilter | 63 | whitelist ${HOME}/.bogofilter |
64 | whitelist ${HOME}/.config/msmtp | ||
62 | whitelist ${HOME}/.config/mutt | 65 | whitelist ${HOME}/.config/mutt |
63 | whitelist ${HOME}/.config/nano | 66 | whitelist ${HOME}/.config/nano |
64 | whitelist ${HOME}/.config/neomutt | 67 | whitelist ${HOME}/.config/neomutt |
@@ -116,7 +119,7 @@ tracelog | |||
116 | #disable-mnt | 119 | #disable-mnt |
117 | private-cache | 120 | private-cache |
118 | private-dev | 121 | private-dev |
119 | private-etc @tls-ca,@x11,Mutt,Muttrc,Muttrc.d,gnupg,hosts.conf,mail,mailname,neomuttrc,neomuttrc.d,nntpserver | 122 | private-etc @tls-ca,@x11,msmtprc,Mutt,Muttrc,Muttrc.d,gnupg,hosts.conf,mail,mailname,neomuttrc,neomuttrc.d,nntpserver |
120 | private-tmp | 123 | private-tmp |
121 | writable-run-user | 124 | writable-run-user |
122 | writable-var | 125 | writable-var |