From 59ca8f987cb943c8a99e8651775626b95078f599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20unbrot=20P=C3=A4tzold?= <unbrot@obel1x.de>
Date: Sat, 25 Apr 2026 15:31:45 +0200
Subject: [PATCH] Include local conf.d definitions

---
 .gitignore                       | 10 ++++++----
 system_setup/setup_system.inc.sh |  5 +++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c26c10..06b3f87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 .Trash*
+*.kdev4
+.kdev4/*
+client_software/.sync_*.db
+client_software/setup_system.conf
 config/setup_system.conf
 config/setup_system.conf.bak
 config/skel.tar.zst
 config/.sync_*.db
-client_software/.sync_*.db
-client_software/setup_system.conf
-*.kdev4
-.kdev4/*
+config/.sync_*.db
+config.d/*
diff --git a/system_setup/setup_system.inc.sh b/system_setup/setup_system.inc.sh
index fa0fa4b..777a9b5 100755
--- a/system_setup/setup_system.inc.sh
+++ b/system_setup/setup_system.inc.sh
@@ -21,6 +21,11 @@ if [ ! -f $(dirname "$0")/../config/setup_system.conf ]; then
 fi
 source $(dirname "$0")/../config/setup_system.conf
 
+#Parse additional client-configs
+if [[ `ls -1 $(dirname "$0")/../config.d/*.conf 2>/dev/null | wc -l ` -gt 0 ]]; then
+    source $(dirname "$0")/../config.d/*.conf
+fi
+
 #Check if the Data- Directory is encrypted
 check_data_isecrypted() {
     CHECKRES=$( cat /etc/mtab | grep "${DECRYPTEDDATADIR}" | grep "fuse.gocryptfs" )