Merge branch 'master' of http://github.com/netblue30/firejail

1 files changed, 6 insertions, 28 deletions

diff --git a/etc/knotes.profile b/etc/knotes.profile
index 85b267f8b..4bbbd332d 100644
--- a/etc/knotes.profile
+++ b/etc/knotes.profile
@@ -5,34 +5,12 @@ include /etc/firejail/knotes.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
-noblacklist ${HOME}/.config/akonadi*
-noblacklist ${HOME}/.config/knotesrc
-noblacklist ${HOME}/.local/share/akonadi*
-noblacklist /tmp/akonadi-*
-
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-passwdmgr.inc
-include /etc/firejail/disable-programs.inc
+# knotes has problems launching akonadi in debian and ubuntu.
+# one solution is to have akonadi already running when knotes is started
 
-include /etc/firejail/whitelist-var-common.inc
-
-caps.drop all
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-nosound
-notv
-novideo
-protocol unix
-seccomp
-shell none
-tracelog
+noblacklist ${HOME}/.config/knotesrc
+noblacklist ${HOME}/.local/share/knotes
 
-private-dev
-# private-tmp - interrupts connection to akonadi
 
-noexec ${HOME}
-noexec /tmp
+# Redirect
+include /etc/firejail/kmail.profile