Unify all profiles

1 files changed, 18 insertions, 17 deletions

diff --git a/etc/geary.profile b/etc/geary.profile
index f655f0efe..5833e51cf 100644
--- a/etc/geary.profile
+++ b/etc/geary.profile
@@ -1,28 +1,29 @@
-# Persistent global definitions go here
-include /etc/firejail/globals.local
-
-# This file is overwritten during software install.
-# Persistent customizations should go in a .local file.
+# Firejail profile for geary
+# This file is overwritten after every install/update
+# Persistent local customizations
 include /etc/firejail/geary.local
-
-# Firejail profile for Gnome Geary
-# Users have Geary set to open a browser by clicking a link in an email
-# We are not allowed to blacklist browser-specific directories
+# Persistent global definitions
+include /etc/firejail/globals.local
 
 noblacklist ~/.gnupg
-mkdir ~/.gnupg
-whitelist ~/.gnupg
-
 noblacklist ~/.local/share/geary
+
+mkdir ~/.gnupg
 mkdir ~/.local/share/geary
+whitelist ~/.config/mimeapps.list
+whitelist ~/.gnupg
+whitelist ~/.local/share/applications
 whitelist ~/.local/share/geary
+include /etc/firejail/whitelist-common.inc
+
+ignore private-tmp
 
-whitelist ~/.config/mimeapps.list
 read-only ~/.config/mimeapps.list
-whitelist ~/.local/share/applications
 read-only ~/.local/share/applications
 
-# allow browsers
-ignore private-tmp
 include /etc/firejail/firefox.profile
-#include /etc/firejail/chromium.profile - chromium runs as suid!
+
+# CLOBBERED COMMENTS
+# Users have Geary set to open a browser by clicking a link in an email
+# We are not allowed to blacklist browser-specific directories
+# allow browsers