index : builder | |
Archlinux32 build system | gitolite user |
summaryrefslogtreecommitdiff |
author | Erich Eckner <git@eckner.net> | 2023-06-11 18:45:23 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2023-06-11 18:45:23 +0200 |
commit | 71d3bddf40149879617d1d6343c83e9ae6514151 (patch) | |
tree | 158b3543cfb2f6875a828ea8467bf0537c611932 /lib | |
parent | 60fd162d7b33a33a9c4c1a22a3b2a1f9298327e1 (diff) |
-rwxr-xr-x | lib/load-configuration | 14 |
diff --git a/lib/load-configuration b/lib/load-configuration index 22b6608..ca1a713 100755 --- a/lib/load-configuration +++ b/lib/load-configuration @@ -141,21 +141,23 @@ fi # possibly pull in custom modifications -if [ -r "${base_dir}/conf/common.conf" ]; then +conf_dir="${base_dir}/conf" + +if [ -r "${conf_dir}/common.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/common.conf" + . "${conf_dir}/common.conf" fi if ${i_am_the_master} && \ - [ -r "${base_dir}/conf/master.conf" ]; then + [ -r "${conf_dir}/master.conf" ]; then # shellcheck source=/dev/null - . "${base_dir}/conf/master.conf" + . "${conf_dir}/master.conf" fi if ! ${i_am_the_master} && \ - [ -r "${base_dir}/conf/slave.conf" ]; then + [ -r "${conf_dir}/slave.conf" ]; then # shellcheck source=../conf/slave.conf.example - . "${base_dir}/conf/slave.conf" + . "${conf_dir}/slave.conf" fi # check / set up environment |