Unify all profiles

1 files changed, 47 insertions, 51 deletions

diff --git a/etc/firefox.profile b/etc/firefox.profile
index aff6e8334..8d48a4704 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -1,77 +1,73 @@
-# 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 firefox
+# This file is overwritten after every install/update
+# Persistent local customizations
 include /etc/firejail/firefox.local
+# Persistent global definitions
+include /etc/firejail/globals.local
 
-# Firejail profile for Mozilla Firefox (Iceweasel in Debian)
-noblacklist ~/.mozilla
 noblacklist ~/.cache/mozilla
+noblacklist ~/.config/okularpartrc
+noblacklist ~/.config/okularrc
 noblacklist ~/.config/qpdfview
-noblacklist ~/.local/share/qpdfview
-noblacklist ~/.kde4/share/apps/okular
 noblacklist ~/.kde/share/apps/okular
+noblacklist ~/.kde4/share/apps/okular
 noblacklist ~/.local/share/okular
-noblacklist ~/.config/okularpartrc
-noblacklist ~/.config/okularrc
+noblacklist ~/.local/share/qpdfview
+noblacklist ~/.mozilla
 noblacklist ~/.pki
 
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
+include /etc/firejail/disable-programs.inc
 
-caps.drop all
-# ipc-namespace crashes firefox on some setups
-netfilter
-nogroups
-nonewprivs
-noroot
-protocol unix,inet,inet6,netlink
-seccomp
-shell none
-tracelog
-
-whitelist ${DOWNLOADS}
-mkdir ~/.mozilla
-whitelist ~/.mozilla
 mkdir ~/.cache/mozilla/firefox
+mkdir ~/.mozilla
+mkdir ~/.pki
+whitelist ${DOWNLOADS}
+whitelist ~/.cache/gnome-mplayer/plugin
 whitelist ~/.cache/mozilla/firefox
-whitelist ~/dwhelper
-whitelist ~/.zotero
-whitelist ~/.vimperatorrc
-whitelist ~/.vimperator
-whitelist ~/.pentadactylrc
-whitelist ~/.pentadactyl
-whitelist ~/.keysnail.js
 whitelist ~/.config/gnome-mplayer
-whitelist ~/.cache/gnome-mplayer/plugin
-mkdir ~/.pki
-whitelist ~/.pki
-whitelist ~/.lastpass
-whitelist ~/.config/qpdfview
-whitelist ~/.local/share/qpdfview
-whitelist ~/.config/okularrc
 whitelist ~/.config/okularpartrc
-whitelist ~/.kde4/share/apps/okular
+whitelist ~/.config/okularrc
+whitelist ~/.config/pipelight-silverlight5.1
+whitelist ~/.config/pipelight-widevine
+whitelist ~/.config/qpdfview
 whitelist ~/.kde/share/apps/okular
+whitelist ~/.kde4/share/apps/okular
+whitelist ~/.keysnail.js
+whitelist ~/.lastpass
 whitelist ~/.local/share/okular
-
-# silverlight
+whitelist ~/.local/share/qpdfview
+whitelist ~/.mozilla
+whitelist ~/.pentadactyl
+whitelist ~/.pentadactylrc
+whitelist ~/.pki
+whitelist ~/.vimperator
+whitelist ~/.vimperatorrc
 whitelist ~/.wine-pipelight
 whitelist ~/.wine-pipelight64
-whitelist ~/.config/pipelight-widevine
-whitelist ~/.config/pipelight-silverlight5.1
-
+whitelist ~/.zotero
+whitelist ~/dwhelper
 include /etc/firejail/whitelist-common.inc
 
-# experimental features
-#private-bin firefox,which,sh,dbus-launch,dbus-send,env
-#private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,firefox,mime.types,mailcap,asound.conf,pulse
-# private-dev might prevent video calls going out
+caps.drop all
+netfilter
+nogroups
+nonewprivs
+noroot
+protocol unix,inet,inet6,netlink
+seccomp
+shell none
+tracelog
+
+# private-bin firefox,which,sh,dbus-launch,dbus-send,env
 private-dev
+# private-dev might prevent video calls going out
+# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,xdg,gtk-2.0,gtk-3.0,X11,pango,fonts,firefox,mime.types,mailcap,asound.conf,pulse
 private-tmp
-#disable-mnt
 
 noexec ${HOME}
 noexec /tmp
+
+# CLOBBERED COMMENTS
+# disable-mnt