From ec719b9e0f4f7258b5f752af4857649a34a35dfe Mon Sep 17 00:00:00 2001
From: The Fox in the Shell <KellerFuchs@hashbang.sh>
Date: Mon, 9 Jan 2017 23:22:31 +0100
Subject: etc: Support local customizations in *.inc

This is useful for places, like hashbang.sh, which have site-specific
modifications of the *.inc files.

With the current setup, the package manager cannot automatically install
updated versions of those files, as it would need to somehow merge the
site-specific and upstream changes.  Having the site-specific changes in
separate files solves this.
---
 etc/disable-common.inc      | 3 +++
 etc/disable-common.local    | 1 +
 etc/disable-devel.inc       | 3 +++
 etc/disable-devel.local     | 1 +
 etc/disable-passwdmgr.inc   | 3 +++
 etc/disable-passwdmgr.local | 1 +
 etc/disable-programs.inc    | 3 +++
 etc/disable-programs.local  | 1 +
 etc/whitelist-common.inc    | 3 +++
 etc/whitelist-common.local  | 1 +
 10 files changed, 20 insertions(+)
 create mode 100644 etc/disable-common.local
 create mode 100644 etc/disable-devel.local
 create mode 100644 etc/disable-passwdmgr.local
 create mode 100644 etc/disable-programs.local
 create mode 100644 etc/whitelist-common.local

(limited to 'etc')

diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index efe5c850d..187d26c83 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -1,3 +1,6 @@
+# Local customizations come here
+include /etc/firejail/disable-common.local
+
 # History files in $HOME
 blacklist-nolog ${HOME}/.history
 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 @@
+# Local customizations come here
+include /etc/firejail/disable-devel.local
+
 # development tools
 
 # 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 @@
+# Local customizations come here
+include /etc/firejail/disable-passwdmgr.local
+
 blacklist ${HOME}/.pki/nssdb
 blacklist ${HOME}/.lastpass
 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 @@
+# Local customizations come here
+include /etc/firejail/disable-programs.local
+
 blacklist ${HOME}/.*coin
 blacklist ${HOME}/.8pecxstudios
 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 @@
+# Local customizations come here
+include /etc/firejail/whitelist-common.local
+
 # common whitelist for all profiles
 
 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
-- 
cgit v1.2.3-54-g00ecf