From 9d674532038e01d9d690a06065f189c2965f44db Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 1 Nov 2022 15:34:40 +0100 Subject: [PATCH] conflict solved --- src/server/server/config/boot_local.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/server/config/boot_local.php b/src/server/server/config/boot_local.php index ce3c70f..840811e 100644 --- a/src/server/server/config/boot_local.php +++ b/src/server/server/config/boot_local.php @@ -21,7 +21,9 @@ Francis_Utils_Config::set( 'db.tbteamdata.pass', 'root' ); // Paths Francis_Utils_Config::set( 'path.logfile', '/var/www/html/logs/tbserver-log.txt' ); Francis_Utils_Config::set( 'path.cron_logfile', '/var/www/html/logs/tbserver-cron-log.txt' ); + Francis_Utils_Config::set( 'path.backup_folder', '/var/www/html/temp' ); + Francis_Utils_Config::set( 'path.root', realpath( dirname( __FILE__ ) . '/../../../..' ) ); Francis_Core_Autoloader::attachLocator( new Francis_Core_Locator( 'TB', Francis_Utils_Config::get( 'path.root' ) . '/src/server' ) ); Francis_Utils_Config::set( 'path.server.controller', Francis_Utils_Config::get( 'path.root' ) . '/src/server/server/control' );