Unify all profiles

1 files changed, 33 insertions, 36 deletions

diff --git a/etc/palemoon.profile b/etc/palemoon.profile
index b3b57f931..ab72497c0 100644
--- a/etc/palemoon.profile
+++ b/etc/palemoon.profile
@@ -1,23 +1,23 @@
-# 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 palemoon
+# This file is overwritten after every install/update
+# Persistent local customizations
 include /etc/firejail/palemoon.local
+# Persistent global definitions
+include /etc/firejail/globals.local
 
-# Firejail profile for Pale Moon
-noblacklist ~/.moonchild productions/pale moon
 noblacklist ~/.cache/moonchild productions/pale moon
+noblacklist ~/.moonchild productions/pale moon
+
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/whitelist-common.inc
+include /etc/firejail/disable-programs.inc
 
-whitelist ${DOWNLOADS}
-mkdir ~/.moonchild productions
-whitelist ~/.moonchild productions
 mkdir ~/.cache/moonchild productions/pale moon
+mkdir ~/.moonchild productions
+whitelist ${DOWNLOADS}
 whitelist ~/.cache/moonchild productions/pale moon
+whitelist ~/.moonchild productions
+include /etc/firejail/whitelist-common.inc
 
 caps.drop all
 netfilter
@@ -29,30 +29,27 @@ seccomp
 shell none
 tracelog
 
-#private-bin palemoon
-#private-opt palemoon
+# private-bin palemoon
+# private-dev (disabled for now as it will interfere with webcam use in palemoon)
+# private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,iceweasel,firefox,adobe,mime.types,mailcap,asound.conf,pulse
+# private-opt palemoon
 private-tmp
 
-# These are uncommented in the Firefox profile. If you run into trouble you may
-# want to uncomment (some of) them.
-#whitelist ~/dwhelper
-#whitelist ~/.zotero
-#whitelist ~/.vimperatorrc
-#whitelist ~/.vimperator
-#whitelist ~/.pentadactylrc
-#whitelist ~/.pentadactyl
-#whitelist ~/.keysnail.js
-#whitelist ~/.config/gnome-mplayer
-#whitelist ~/.cache/gnome-mplayer/plugin
-#whitelist ~/.pki
-#whitelist ~/.lastpass
-
+# CLOBBERED COMMENTS
 # For silverlight
-#whitelist ~/.wine-pipelight
-#whitelist ~/.wine-pipelight64
-#whitelist ~/.config/pipelight-widevine
-#whitelist ~/.config/pipelight-silverlight5.1
-
-# experimental features
-#private-etc passwd,group,hostname,hosts,localtime,nsswitch.conf,resolv.conf,gtk-2.0,pango,fonts,iceweasel,firefox,adobe,mime.types,mailcap,asound.conf,pulse
-#private-dev (disabled for now as it will interfere with webcam use in palemoon)
+# want to uncomment (some of) them.
+# whitelist ~/.cache/gnome-mplayer/plugin
+# whitelist ~/.config/gnome-mplayer
+# whitelist ~/.config/pipelight-silverlight5.1
+# whitelist ~/.config/pipelight-widevine
+# whitelist ~/.keysnail.js
+# whitelist ~/.lastpass
+# whitelist ~/.pentadactyl
+# whitelist ~/.pentadactylrc
+# whitelist ~/.pki
+# whitelist ~/.vimperator
+# whitelist ~/.vimperatorrc
+# whitelist ~/.wine-pipelight
+# whitelist ~/.wine-pipelight64
+# whitelist ~/.zotero
+# whitelist ~/dwhelper