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