From 13d30d779dac2bb568f73bb0a028932586e6ec74 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 25 May 2018 10:52:34 +0200
Subject: lib/load-configuration: legacily load conf/local.conf, too

---
 lib/load-configuration | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib')

diff --git a/lib/load-configuration b/lib/load-configuration
index 095cadd..7e0ed11 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -102,6 +102,12 @@ mysql_command='mysql buildmaster'
 
 # possibly pull in custom modifications
 
+# TODO: remove this legacy part here
+if [ -r "${base_dir}/conf/local.conf" ]; then
+  # shellcheck source=/dev/null
+  "${base_dir}/conf/local.conf"
+fi
+
 if [ -r "${base_dir}/conf/common.conf" ]; then
   # shellcheck source=/dev/null
   "${base_dir}/conf/common.conf"
-- 
cgit v1.2.3-70-g09d2