diff options
author | netblue30 <netblue30@yahoo.com> | 2017-01-11 12:16:17 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-11 12:16:17 -0500 |
commit | 54e60b37c2e07fcc3ad9108bcde1db22da17ad85 (patch) | |
tree | 6fd126719667745ca1f88d8e4ddb5444cf5fc296 /etc | |
parent | Merge pull request #1035 from KellerFuchs/disable-mutt (diff) | |
parent | etc: Support local customizations in *.inc (diff) | |
download | firejail-54e60b37c2e07fcc3ad9108bcde1db22da17ad85.tar.gz firejail-54e60b37c2e07fcc3ad9108bcde1db22da17ad85.tar.zst firejail-54e60b37c2e07fcc3ad9108bcde1db22da17ad85.zip |
Merge pull request #1034 from KellerFuchs/disable-local
etc: Support local customizations in *.inc
Diffstat (limited to 'etc')
-rw-r--r-- | etc/disable-common.inc | 3 | ||||
-rw-r--r-- | etc/disable-common.local | 1 | ||||
-rw-r--r-- | etc/disable-devel.inc | 3 | ||||
-rw-r--r-- | etc/disable-devel.local | 1 | ||||
-rw-r--r-- | etc/disable-passwdmgr.inc | 3 | ||||
-rw-r--r-- | etc/disable-passwdmgr.local | 1 | ||||
-rw-r--r-- | etc/disable-programs.inc | 3 | ||||
-rw-r--r-- | etc/disable-programs.local | 1 | ||||
-rw-r--r-- | etc/whitelist-common.inc | 3 | ||||
-rw-r--r-- | etc/whitelist-common.local | 1 |
10 files changed, 20 insertions, 0 deletions
diff --git a/etc/disable-common.inc b/etc/disable-common.inc index c9e681d1b..5a281a91f 100644 --- a/etc/disable-common.inc +++ b/etc/disable-common.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # Local customizations come here | ||
2 | include /etc/firejail/disable-common.local | ||
3 | |||
1 | # History files in $HOME | 4 | # History files in $HOME |
2 | blacklist-nolog ${HOME}/.history | 5 | blacklist-nolog ${HOME}/.history |
3 | blacklist-nolog ${HOME}/.*_history | 6 | blacklist-nolog ${HOME}/.*_history |
diff --git a/etc/disable-common.local b/etc/disable-common.local new file mode 100644 index 000000000..c9fbadfaf --- /dev/null +++ b/etc/disable-common.local | |||
@@ -0,0 +1 @@ | |||
# This file is meant for local customizations of disable-common.local | |||
diff --git a/etc/disable-devel.inc b/etc/disable-devel.inc index 2ac367f37..07fc3928c 100644 --- a/etc/disable-devel.inc +++ b/etc/disable-devel.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # Local customizations come here | ||
2 | include /etc/firejail/disable-devel.local | ||
3 | |||
1 | # development tools | 4 | # development tools |
2 | 5 | ||
3 | # GCC | 6 | # GCC |
diff --git a/etc/disable-devel.local b/etc/disable-devel.local new file mode 100644 index 000000000..6ce1a8c75 --- /dev/null +++ b/etc/disable-devel.local | |||
@@ -0,0 +1 @@ | |||
# This file is meant for local customizations of disable-devel.local | |||
diff --git a/etc/disable-passwdmgr.inc b/etc/disable-passwdmgr.inc index 045b4d92b..7d129b2e4 100644 --- a/etc/disable-passwdmgr.inc +++ b/etc/disable-passwdmgr.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # Local customizations come here | ||
2 | include /etc/firejail/disable-passwdmgr.local | ||
3 | |||
1 | blacklist ${HOME}/.pki/nssdb | 4 | blacklist ${HOME}/.pki/nssdb |
2 | blacklist ${HOME}/.lastpass | 5 | blacklist ${HOME}/.lastpass |
3 | blacklist ${HOME}/.keepassx | 6 | blacklist ${HOME}/.keepassx |
diff --git a/etc/disable-passwdmgr.local b/etc/disable-passwdmgr.local new file mode 100644 index 000000000..2a3bb45d3 --- /dev/null +++ b/etc/disable-passwdmgr.local | |||
@@ -0,0 +1 @@ | |||
# This file is meant for local customizations of disable-passwdmgr.local | |||
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index e5eb4f857..96bf1464b 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # Local customizations come here | ||
2 | include /etc/firejail/disable-programs.local | ||
3 | |||
1 | blacklist ${HOME}/.*coin | 4 | blacklist ${HOME}/.*coin |
2 | blacklist ${HOME}/.8pecxstudios | 5 | blacklist ${HOME}/.8pecxstudios |
3 | blacklist ${HOME}/.Atom | 6 | blacklist ${HOME}/.Atom |
diff --git a/etc/disable-programs.local b/etc/disable-programs.local new file mode 100644 index 000000000..6c226a331 --- /dev/null +++ b/etc/disable-programs.local | |||
@@ -0,0 +1 @@ | |||
# This file is meant for local customizations of disable-programs.local | |||
diff --git a/etc/whitelist-common.inc b/etc/whitelist-common.inc index d4e69948e..cf7797100 100644 --- a/etc/whitelist-common.inc +++ b/etc/whitelist-common.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # Local customizations come here | ||
2 | include /etc/firejail/whitelist-common.local | ||
3 | |||
1 | # common whitelist for all profiles | 4 | # common whitelist for all profiles |
2 | 5 | ||
3 | whitelist ~/.XCompose | 6 | whitelist ~/.XCompose |
diff --git a/etc/whitelist-common.local b/etc/whitelist-common.local new file mode 100644 index 000000000..11ed186ce --- /dev/null +++ b/etc/whitelist-common.local | |||
@@ -0,0 +1 @@ | |||
# This file is meant for local customizations of whitelist-common.local | |||