From e3561c49a8c8228d04b974f42cce61db3fadf4ba Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Mon, 7 Oct 2024 12:18:02 +0100 Subject: [PATCH] DBQ_CONF_DIR sub dirs --- lib/php/db/config.php | 60 +++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/lib/php/db/config.php b/lib/php/db/config.php index 68e611d9..450b2a3a 100644 --- a/lib/php/db/config.php +++ b/lib/php/db/config.php @@ -35,41 +35,45 @@ if (!empty($_SERVER['DBQ_CONF_DIR'])) { (array)glob($dir.'/*.yml'), (array)glob($dir.'/*.yaml'), (array)glob($dir.'/*.php'), + (array)glob($dir.'/*/*.yml'), + (array)glob($dir.'/*/*.yaml'), + (array)glob($dir.'/*/*.php'), []); } } # NB 08.01.18: TODEL -if (empty($DB_CONFS)) $DB_CONFS = array_merge([], - - # /etc - [ - '/etc/dbq.yml', - '/etc/dbq.yaml', - '/etc/dbq.php', - ], - (array)glob('/etc/dbq/*.yml'), - (array)glob('/etc/dbq/*.yaml'), - (array)glob('/etc/dbq/*.php'), - - # ~/ - [ - $_SERVER['HOME'].'/.dbq.yml', - $_SERVER['HOME'].'/.dbq.yaml', - $_SERVER['HOME'].'/.dbq.php', - ], - (array)glob($_SERVER['HOME'].'/.dbq/*.yml'), - (array)glob($_SERVER['HOME'].'/.dbq/*.yaml'), - (array)glob($_SERVER['HOME'].'/.dbq/*.php'), - - # ROOT_DIR - (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yml'), - (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yaml'), - (array)glob(Db::ROOT_DIR.'/etc/dbq/*.php'), - -[]); +# NB 07.10.24 if (empty($DB_CONFS)) $DB_CONFS = array_merge([], +# NB 07.10.24 + # NB 07.10.24 # /etc + # NB 07.10.24 [ + # NB 07.10.24 '/etc/dbq.yml', + # NB 07.10.24 '/etc/dbq.yaml', + # NB 07.10.24 '/etc/dbq.php', + # NB 07.10.24 ], + # NB 07.10.24 (array)glob('/etc/dbq/*.yml'), + # NB 07.10.24 (array)glob('/etc/dbq/*.yaml'), + # NB 07.10.24 (array)glob('/etc/dbq/*.php'), +# NB 07.10.24 + # NB 07.10.24 # ~/ + # NB 07.10.24 [ + # NB 07.10.24 $_SERVER['HOME'].'/.dbq.yml', + # NB 07.10.24 $_SERVER['HOME'].'/.dbq.yaml', + # NB 07.10.24 $_SERVER['HOME'].'/.dbq.php', + # NB 07.10.24 ], + # NB 07.10.24 (array)glob($_SERVER['HOME'].'/.dbq/*.yml'), + # NB 07.10.24 (array)glob($_SERVER['HOME'].'/.dbq/*.yaml'), + # NB 07.10.24 (array)glob($_SERVER['HOME'].'/.dbq/*.php'), +# NB 07.10.24 + # NB 07.10.24 # ROOT_DIR + # NB 07.10.24 (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yml'), + # NB 07.10.24 (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yaml'), + # NB 07.10.24 (array)glob(Db::ROOT_DIR.'/etc/dbq/*.php'), +# NB 07.10.24 +# NB 07.10.24 []); #bye($DB_CONFS); +#debug($DB_CONFS); $DB_CONFS = Db::conf_load($DB_CONFS); #bye(array_keys($DB_CONFS)); -- 2.47.3