diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.0alpha5/ui/include/classes/core/CConfigFile.php --- zabbix-6.0.0alpha5.orig/ui/include/classes/core/CConfigFile.php 2021-10-25 13:53:56.255241288 +0300 +++ zabbix-6.0.0alpha5/ui/include/classes/core/CConfigFile.php 2021-10-25 13:55:17.469626565 +0300 @@ -25,7 +25,7 @@ const CONFIG_ERROR = 2; const CONFIG_VAULT_ERROR = 3; - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php'; + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php'; private static $supported_db_types = [ ZBX_DB_MYSQL => true, diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/core/ZBase.php zabbix-6.0.0alpha5/ui/include/classes/core/ZBase.php --- zabbix-6.0.0alpha5.orig/ui/include/classes/core/ZBase.php 2021-10-25 13:53:56.255241288 +0300 +++ zabbix-6.0.0alpha5/ui/include/classes/core/ZBase.php 2021-10-25 13:56:49.379799191 +0300 @@ -368,7 +368,7 @@ * @throws Exception */ protected function setMaintenanceMode() { - require_once 'conf/maintenance.inc.php'; + require_once '/etc/zabbix/web/maintenance.inc.php'; if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { @@ -381,7 +381,7 @@ * Load zabbix config file. */ protected function loadConfigFile() { - $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; $config = new CConfigFile($configFile); $this->config = $config->load(); } diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.0alpha5/ui/include/classes/setup/CSetupWizard.php --- zabbix-6.0.0alpha5.orig/ui/include/classes/setup/CSetupWizard.php 2021-10-25 13:53:56.255241288 +0300 +++ zabbix-6.0.0alpha5/ui/include/classes/setup/CSetupWizard.php 2021-10-25 14:00:03.899931721 +0300 @@ -259,7 +259,7 @@ // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); - $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ 'TYPE' => $this->getConfig('DB_TYPE'), @@ -793,7 +793,7 @@ $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true); - $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH; + $config_file_name = CConfigFile::CONFIG_FILE_PATH; $config = new CConfigFile($config_file_name); $config->config = [ 'DB' => [