consolidated disable-terminals into disable-common

63 files changed, 61 insertions, 93 deletions

diff --git a/Makefile.in b/Makefile.in
index 5951394d7..df010c199 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,6 @@ realinstall:
         install -c -m 0644 .etc/uget-gtk.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/mupen64plus.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/disable-programs.inc $(DESTDIR)/$(sysconfdir)/firejail/.
-        install -c -m 0644 .etc/disable-terminals.inc $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/lxterminal.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/cherrytree.profile $(DESTDIR)/$(sysconfdir)/firejail/.
         install -c -m 0644 .etc/wesnoth.profile $(DESTDIR)/$(sysconfdir)/firejail/.
diff --git a/etc/Mathematica.profile b/etc/Mathematica.profile
index c3ce7b618..1ee50b4d4 100644
--- a/etc/Mathematica.profile
+++ b/etc/Mathematica.profile
@@ -5,10 +5,11 @@ mkdir ~/.Wolfram Research
 whitelist ~/.Wolfram Research
 whitelist ~/Documents/Wolfram Mathematica
 include /etc/firejail/whitelist-common.inc
+
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 noroot
diff --git a/etc/audacious.profile b/etc/audacious.profile
index 49417fbfe..690463a46 100644
--- a/etc/audacious.profile
+++ b/etc/audacious.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/bitlbee.profile b/etc/bitlbee.profile
index c3bd58298..753e42480 100644
--- a/etc/bitlbee.profile
+++ b/etc/bitlbee.profile
@@ -3,7 +3,6 @@ noblacklist /sbin
 noblacklist /usr/sbin
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 protocol unix,inet,inet6
 private
 private-dev
diff --git a/etc/cherrytree.profile b/etc/cherrytree.profile
index 09e87f043..349cc7acf 100644
--- a/etc/cherrytree.profile
+++ b/etc/cherrytree.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 whitelist ${HOME}/cherrytree
 mkdir ~/.config
diff --git a/etc/chromium.profile b/etc/chromium.profile
index 751426db8..58f62daa2 100644
--- a/etc/chromium.profile
+++ b/etc/chromium.profile
@@ -4,7 +4,6 @@ noblacklist ~/.cache/chromium
 noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 
 # chromium is distributed with a perl script on Arch
 # include /etc/firejail/disable-devel.inc
diff --git a/etc/clementine.profile b/etc/clementine.profile
index 4737541db..cc0614551 100644
--- a/etc/clementine.profile
+++ b/etc/clementine.profile
@@ -1,7 +1,6 @@
 # Clementine media player profile
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 include /etc/firejail/disable-devel.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
diff --git a/etc/conkeror.profile b/etc/conkeror.profile
index 57fedac61..67e529d0a 100644
--- a/etc/conkeror.profile
+++ b/etc/conkeror.profile
@@ -2,7 +2,6 @@
 noblacklist ${HOME}/.conkeror.mozdev.org
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/deadbeef.profile b/etc/deadbeef.profile
index 4f222947f..89661d83c 100644
--- a/etc/deadbeef.profile
+++ b/etc/deadbeef.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/deluge.profile b/etc/deluge.profile
index aeafb7a4a..eef2a42ee 100644
--- a/etc/deluge.profile
+++ b/etc/deluge.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index cb356dcf7..71439e10d 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -125,3 +125,9 @@ blacklist /usr/local/sbin
 
 # prevent lxterminal connecting to an existing lxterminal session
 blacklist /tmp/.lxterminal-socket*
+
+# disable terminals running as server
+blacklist ${PATH}/gnome-terminal
+blacklist ${PATH}/gnome-terminal.wrapper
+blacklist ${PATH}/xfce4-terminal
+blacklist ${PATH}/xfce4-terminal.wrapper
diff --git a/etc/disable-mgmt.inc b/etc/disable-mgmt.inc
deleted file mode 100644
index e69de29bb..000000000
--- a/etc/disable-mgmt.inc
+++ /dev/null
diff --git a/etc/disable-secret.inc b/etc/disable-secret.inc
deleted file mode 100644
index 7d29cda31..000000000
--- a/etc/disable-secret.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-# HOME directory
-blacklist ${HOME}/.ssh
-blacklist ${HOME}/.gnome2/keyrings
-blacklist ${HOME}/kde4/share/apps/kwallet
-blacklist ${HOME}/kde/share/apps/kwallet
-blacklist ${HOME}/.local/share/kwalletd
-blacklist ${HOME}/.netrc
-blacklist ${HOME}/.gnupg
-blacklist ${HOME}/*.kdbx
-blacklist ${HOME}/*.kdb
-blacklist ${HOME}/*.key
-blacklist /etc/shadow
-blacklist /etc/gshadow
-blacklist /etc/passwd-
-blacklist /etc/group-
-blacklist /etc/shadow-
-blacklist /etc/gshadow-
-blacklist /etc/passwd+
-blacklist /etc/group+
-blacklist /etc/shadow+
-blacklist /etc/gshadow+
-blacklist /etc/ssh
-blacklist /var/backup
diff --git a/etc/disable-terminals.inc b/etc/disable-terminals.inc
deleted file mode 100644
index c9db48087..000000000
--- a/etc/disable-terminals.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# disable terminals running as server
-blacklist ${PATH}/gnome-terminal
-blacklist ${PATH}/gnome-terminal.wrapper
-blacklist ${PATH}/xfce4-terminal
-blacklist ${PATH}/xfce4-terminal.wrapper
diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile
index 368830f15..dc6b783ee 100644
--- a/etc/dnscrypt-proxy.profile
+++ b/etc/dnscrypt-proxy.profile
@@ -4,7 +4,6 @@ noblacklist /usr/sbin
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 private
 private-dev
 seccomp.drop mount,umount2,ptrace,kexec_load,kexec_file_load,open_by_handle_at,init_module,finit_module,delete_module,iopl,ioperm,swapon,swapoff,syslog,process_vm_readv,process_vm_writev,sysfs,_sysctl,adjtimex,clock_adjtime,lookup_dcookie,perf_event_open,fanotify_init,kcmp,add_key,request_key,keyctl,uselib,acct,modify_ldt,pivot_root,io_setup,io_destroy,io_getevents,io_submit,io_cancel,remap_file_pages,mbind,get_mempolicy,set_mempolicy,migrate_pages,move_pages,vmsplice,perf_event_open
diff --git a/etc/dropbox.profile b/etc/dropbox.profile
index d31d1be8f..3b48f0d49 100644
--- a/etc/dropbox.profile
+++ b/etc/dropbox.profile
@@ -1,7 +1,6 @@
 # dropbox profile
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/empathy.profile b/etc/empathy.profile
index 46a69120b..1c46f8b3e 100644
--- a/etc/empathy.profile
+++ b/etc/empathy.profile
@@ -2,7 +2,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/epiphany.profile b/etc/epiphany.profile
index b06e6ea78..319d2b177 100644
--- a/etc/epiphany.profile
+++ b/etc/epiphany.profile
@@ -2,7 +2,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 whitelist ${DOWNLOADS}
 mkdir ${HOME}/.local
 mkdir ${HOME}/.local/share
diff --git a/etc/evince.profile b/etc/evince.profile
index 7b81c0453..13b342f06 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -2,7 +2,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/fbreader.profile b/etc/fbreader.profile
index e7d61160e..4b45208d7 100644
--- a/etc/fbreader.profile
+++ b/etc/fbreader.profile
@@ -3,7 +3,7 @@ noblacklist ${HOME}/.FBReader
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/filezilla.profile b/etc/filezilla.profile
index 39689e717..09e56b1ce 100644
--- a/etc/filezilla.profile
+++ b/etc/filezilla.profile
@@ -4,7 +4,7 @@ noblacklist ${HOME}/.config/filezilla
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/etc/firefox.profile b/etc/firefox.profile
index f23f84097..2d2716256 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -6,7 +6,6 @@ noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 caps.drop all
 seccomp
diff --git a/etc/flashpeak-slimjet.profile b/etc/flashpeak-slimjet.profile
index 613ef6652..3f6af42b1 100644
--- a/etc/flashpeak-slimjet.profile
+++ b/etc/flashpeak-slimjet.profile
@@ -10,7 +10,6 @@ noblacklist ~/.cache/slimjet
 noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 
 # chromium is distributed with a perl script on Arch
 # include /etc/firejail/disable-devel.inc
diff --git a/etc/generic.profile b/etc/generic.profile
index ae42c8a3b..2bf7a0703 100644
--- a/etc/generic.profile
+++ b/etc/generic.profile
@@ -3,7 +3,7 @@
 ################################
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/gnome-mplayer.profile b/etc/gnome-mplayer.profile
index 2313f36fc..1138a73bd 100644
--- a/etc/gnome-mplayer.profile
+++ b/etc/gnome-mplayer.profile
@@ -2,7 +2,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile
index 57c224191..8ca049778 100644
--- a/etc/google-chrome-beta.profile
+++ b/etc/google-chrome-beta.profile
@@ -4,7 +4,6 @@ noblacklist ~/.cache/google-chrome-beta
 noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 
 # chromium is distributed with a perl script on Arch
 # include /etc/firejail/disable-devel.inc
diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile
index e222ccf54..3e238d8f8 100644
--- a/etc/google-chrome-unstable.profile
+++ b/etc/google-chrome-unstable.profile
@@ -4,7 +4,6 @@ noblacklist ~/.cache/google-chrome-unstable
 noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 
 # chromium is distributed with a perl script on Arch
 # include /etc/firejail/disable-devel.inc
diff --git a/etc/google-chrome.profile b/etc/google-chrome.profile
index 767f73f88..afc57f948 100644
--- a/etc/google-chrome.profile
+++ b/etc/google-chrome.profile
@@ -4,7 +4,6 @@ noblacklist ~/.cache/google-chrome
 noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
 
 # chromium is distributed with a perl script on Arch
 # include /etc/firejail/disable-devel.inc
diff --git a/etc/hedgewars.profile b/etc/hedgewars.profile
index a9f1da373..13a311070 100644
--- a/etc/hedgewars.profile
+++ b/etc/hedgewars.profile
@@ -3,12 +3,10 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 caps.drop all
 noroot
 private-dev
-whitelist /tmp/.X11-unix
 seccomp
 tracelog
 
diff --git a/etc/hexchat.profile b/etc/hexchat.profile
index 6ceeaefce..8f6fd6217 100644
--- a/etc/hexchat.profile
+++ b/etc/hexchat.profile
@@ -3,7 +3,7 @@ noblacklist ${HOME}/.config/hexchat
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/kmail.profile b/etc/kmail.profile
index 35a1a15a0..78e72a7a7 100644
--- a/etc/kmail.profile
+++ b/etc/kmail.profile
@@ -3,12 +3,13 @@ noblacklist ${HOME}/.gnupg
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6,netlink
diff --git a/etc/lxterminal.profile b/etc/lxterminal.profile
index e98ac0b83..88a7a8c7a 100644
--- a/etc/lxterminal.profile
+++ b/etc/lxterminal.profile
@@ -2,14 +2,14 @@
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
 netfilter
-
 #noroot - somehow this breaks on Debian Jessie!
-
diff --git a/etc/midori.profile b/etc/midori.profile
index 1cd686bfe..7fc27e07c 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -3,7 +3,7 @@ noblacklist ${HOME}/.config/midori
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/mupen64plus.profile b/etc/mupen64plus.profile
index 5a4ad4f24..45dc4757f 100644
--- a/etc/mupen64plus.profile
+++ b/etc/mupen64plus.profile
@@ -3,7 +3,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 mkdir ${HOME}/.local
 mkdir ${HOME}/.local/share
 mkdir ${HOME}/.local/share/mupen64plus
@@ -11,6 +11,7 @@ whitelist ${HOME}/.local/share/mupen64plus/
 mkdir ${HOME}/.config
 mkdir ${HOME}/.config/mupen64plus
 whitelist ${HOME}/.config/mupen64plus/
+
 noroot
 caps.drop all
 seccomp
diff --git a/etc/openbox.profile b/etc/openbox.profile
index 42eb5e9fa..8a46e6841 100644
--- a/etc/openbox.profile
+++ b/etc/openbox.profile
@@ -1,12 +1,15 @@
 ################################
-# Generic GUI application profile
+# OpenBox window manager profile
+# - all applications started in OpenBox will run in
+# this profile
 ################################
 include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/opera-beta.profile b/etc/opera-beta.profile
index 9659b30de..7b74d6dd1 100644
--- a/etc/opera-beta.profile
+++ b/etc/opera-beta.profile
@@ -5,7 +5,6 @@ noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 netfilter
 
diff --git a/etc/opera.profile b/etc/opera.profile
index 3c8868896..2d7a9ca06 100644
--- a/etc/opera.profile
+++ b/etc/opera.profile
@@ -5,7 +5,6 @@ noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 netfilter
 
diff --git a/etc/parole.profile b/etc/parole.profile
index 3369b191c..9f63e5b16 100644
--- a/etc/parole.profile
+++ b/etc/parole.profile
@@ -2,13 +2,15 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 private-etc passwd,group,fonts
 private-bin parole,dbus-launch
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/pidgin.profile b/etc/pidgin.profile
index 8080a8905..ea5d82103 100644
--- a/etc/pidgin.profile
+++ b/etc/pidgin.profile
@@ -3,8 +3,9 @@ noblacklist ${HOME}/.purple
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/polari.profile b/etc/polari.profile
index 5e40aedf5..0bc46f3f7 100644
--- a/etc/polari.profile
+++ b/etc/polari.profile
@@ -2,7 +2,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 mkdir ${HOME}/.local
 mkdir ${HOME}/.local/share/
 mkdir ${HOME}/.local/share/Empathy
@@ -20,6 +20,7 @@ whitelist ${HOME}/.cache/telepathy
 mkdir ${HOME}/.purple
 whitelist ${HOME}/.purple
 include /etc/firejail/whitelist-common.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/qbittorrent.profile b/etc/qbittorrent.profile
index 87afb78a6..9ad073b05 100644
--- a/etc/qbittorrent.profile
+++ b/etc/qbittorrent.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/qtox.profile b/etc/qtox.profile
index 976e80c31..80acc3873 100644
--- a/etc/qtox.profile
+++ b/etc/qtox.profile
@@ -3,11 +3,12 @@ noblacklist ${HOME}/.config/tox
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 mkdir ${HOME}/.config/tox
 whitelist ${HOME}/.config/tox
 whitelist ${DOWNLOADS}
 include /etc/firejail/whitelist-common.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/quassel.profile b/etc/quassel.profile
index 073b50623..1fba23784 100644
--- a/etc/quassel.profile
+++ b/etc/quassel.profile
@@ -2,8 +2,9 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/qutebrowser.profile b/etc/qutebrowser.profile
index 31b075c7a..3b7bf2d55 100644
--- a/etc/qutebrowser.profile
+++ b/etc/qutebrowser.profile
@@ -5,8 +5,6 @@ noblacklist ~/.cache/qutebrowser
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
-
 
 caps.drop all
 seccomp
diff --git a/etc/rhythmbox.profile b/etc/rhythmbox.profile
index 3215063fa..50838a15b 100644
--- a/etc/rhythmbox.profile
+++ b/etc/rhythmbox.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/rtorrent.profile b/etc/rtorrent.profile
index 2c6689811..5575dcd63 100644
--- a/etc/rtorrent.profile
+++ b/etc/rtorrent.profile
@@ -2,7 +2,7 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-terminals.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/seamonkey.profile b/etc/seamonkey.profile
index 08a6ad521..71a52b3bb 100644
--- a/etc/seamonkey.profile
+++ b/etc/seamonkey.profile
@@ -5,7 +5,6 @@ noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 caps.drop all
 seccomp
@@ -48,8 +47,6 @@ 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
 
diff --git a/etc/skype.profile b/etc/skype.profile
index 77f10e644..26feac1a4 100644
--- a/etc/skype.profile
+++ b/etc/skype.profile
@@ -3,7 +3,7 @@ noblacklist ${HOME}/.Skype
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 netfilter
 noroot
diff --git a/etc/ssh.profile b/etc/ssh.profile
index f0e33540a..32536c0a7 100644
--- a/etc/ssh.profile
+++ b/etc/ssh.profile
@@ -2,11 +2,12 @@
 noblacklist ~/.ssh
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/steam.profile b/etc/steam.profile
index 7cfa21028..31ebf543e 100644
--- a/etc/steam.profile
+++ b/etc/steam.profile
@@ -4,7 +4,7 @@ noblacklist ${HOME}/.local/share/steam
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 netfilter
 noroot
diff --git a/etc/telegram.profile b/etc/telegram.profile
index acafdda00..df6b6a270 100644
--- a/etc/telegram.profile
+++ b/etc/telegram.profile
@@ -3,7 +3,6 @@ noblacklist ${HOME}/.TelegramDesktop
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 caps.drop all
 seccomp
diff --git a/etc/totem.profile b/etc/totem.profile
index 2cff319a7..ad55e320a 100644
--- a/etc/totem.profile
+++ b/etc/totem.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/transmission-gtk.profile b/etc/transmission-gtk.profile
index 269686fa1..ac685aee4 100644
--- a/etc/transmission-gtk.profile
+++ b/etc/transmission-gtk.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/transmission-qt.profile b/etc/transmission-qt.profile
index d032752b4..b8dffbece 100644
--- a/etc/transmission-qt.profile
+++ b/etc/transmission-qt.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/uget-gtk.profile b/etc/uget-gtk.profile
index 4a6544a12..6593075c8 100644
--- a/etc/uget-gtk.profile
+++ b/etc/uget-gtk.profile
@@ -2,12 +2,13 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
 netfilter
 noroot
+
 whitelist ${DOWNLOADS}
 mkdir ~/.config
 mkdir ~/.config/uGet
diff --git a/etc/unbound.profile b/etc/unbound.profile
index 594d67cf9..24ca88b03 100644
--- a/etc/unbound.profile
+++ b/etc/unbound.profile
@@ -4,7 +4,7 @@ noblacklist /usr/sbin
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 private
 private-dev
 seccomp.drop mount,umount2,ptrace,kexec_load,kexec_file_load,open_by_handle_at,init_module,finit_module,delete_module,iopl,ioperm,swapon,swapoff,syslog,process_vm_readv,process_vm_writev,sysfs,_sysctl,adjtimex,clock_adjtime,lookup_dcookie,perf_event_open,fanotify_init,kcmp,add_key,request_key,keyctl,uselib,acct,modify_ldt,pivot_root,io_setup,io_destroy,io_getevents,io_submit,io_cancel,remap_file_pages,mbind,get_mempolicy,set_mempolicy,migrate_pages,move_pages,vmsplice,perf_event_open
diff --git a/etc/vivaldi.profile b/etc/vivaldi.profile
index e039c4676..a4ab60e6c 100644
--- a/etc/vivaldi.profile
+++ b/etc/vivaldi.profile
@@ -5,7 +5,6 @@ noblacklist ~/keepassx.kdbx
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 netfilter
 
diff --git a/etc/vlc.profile b/etc/vlc.profile
index 980d2816f..7cd913040 100644
--- a/etc/vlc.profile
+++ b/etc/vlc.profile
@@ -3,12 +3,13 @@ noblacklist ${HOME}/.config/vlc
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 blacklist ${HOME}/.keepassx
 blacklist ${HOME}/.password-store
 blacklist ${HOME}/.wine
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/weechat.profile b/etc/weechat.profile
index ec305b45b..280a5f9d8 100644
--- a/etc/weechat.profile
+++ b/etc/weechat.profile
@@ -2,7 +2,7 @@
 noblacklist ${HOME}/.weechat
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 seccomp
 protocol unix,inet,inet6
diff --git a/etc/wesnoth.profile b/etc/wesnoth.profile
index 7a2ade1fe..4075232d2 100644
--- a/etc/wesnoth.profile
+++ b/etc/wesnoth.profile
@@ -3,7 +3,6 @@
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
 
 caps.drop all
 seccomp
diff --git a/etc/wine.profile b/etc/wine.profile
index 993037794..f93fa6dc2 100644
--- a/etc/wine.profile
+++ b/etc/wine.profile
@@ -5,7 +5,7 @@ noblacklist ${HOME}/.wine
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 caps.drop all
 netfilter
 noroot
diff --git a/etc/xchat.profile b/etc/xchat.profile
index 552918750..ae1a6de53 100644
--- a/etc/xchat.profile
+++ b/etc/xchat.profile
@@ -3,7 +3,7 @@ noblacklist ${HOME}/.config/xchat
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-terminals.inc
+
 blacklist ${HOME}/.wine
 caps.drop all
 seccomp
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 0d37a464b..64a7006a3 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -63,7 +63,6 @@
 /etc/firejail/Mathematica.profile
 /etc/firejail/uget-gtk.profile
 /etc/firejail/mupen64plus.profile
-/etc/firejail/disable-terminals.inc
 /etc/firejail/lxterminal.profile
 /etc/firejail/cherrytree.profile
 /etc/firejail/wesnoth.profile