Skip to content
Snippets Groups Projects
Commit 65bd53f5 authored by hahn's avatar hahn
Browse files

update config reader

parent f2b23d34
No related branches found
No related tags found
1 merge request!195534 add docker
<?php
$aConfig = include('config_defaults.php');
if (file_exists('config_custom.php')){
if (file_exists(__DIR__.'/config_custom.php')){
$aConfig = array_replace_recursive(
$aConfig,
include('config_custom.php')
......@@ -13,8 +13,8 @@ if (file_exists('config_custom.php')){
// ----------------------------------------------------------------------
$aConfig = array_merge($aConfig, [
'appRootDir' => dirname(dirname(__FILE__)),
'configDir' => dirname(__FILE__),
'appRootDir' => dirname(__DIR__),
'configDir' => __DIR__,
'dataDir' => $aConfig['workDir'] . '/data', // to write data: ssh keys, projects, database
'buildDir' => $aConfig['workDir'] . '/build',
'buildDefaultsDir' => $aConfig['workDir'] . '/defaults',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment