Projects
Eulaceura:Factory
zabbix
_service:obs_scm:zabbix-config.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:zabbix-config.patch of Package zabbix
diff --git a/ui/include/classes/core/CConfigFile.php b/ui/include/classes/core/CConfigFile.php index d7ad93a..88b7d5f 100644 --- a/ui/include/classes/core/CConfigFile.php +++ b/ui/include/classes/core/CConfigFile.php @@ -20,7 +20,7 @@ class CConfigFile { 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 --git a/ui/include/classes/core/ZBase.php b/ui/include/classes/core/ZBase.php index 51b2165..e57e5a8 100644 --- a/ui/include/classes/core/ZBase.php +++ b/ui/include/classes/core/ZBase.php @@ -392,7 +392,7 @@ class ZBase { * @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)) { @@ -405,7 +405,7 @@ class ZBase { * Load zabbix config file. */ protected function loadConfigFile(): void { - $configFile = $this->root_dir.CConfigFile::CONFIG_FILE_PATH; + $configFile = CConfigFile::CONFIG_FILE_PATH; $config = new CConfigFile($configFile); diff --git a/ui/include/classes/setup/CSetupWizard.php b/ui/include/classes/setup/CSetupWizard.php index 8574868..79d0c72 100644 --- a/ui/include/classes/setup/CSetupWizard.php +++ b/ui/include/classes/setup/CSetupWizard.php @@ -328,7 +328,7 @@ class CSetupWizard extends CForm { // 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::getRootDir().CConfigFile::CONFIG_FILE_PATH); + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH); $config->config = [ 'DB' => [ 'TYPE' => $this->getConfig('DB_TYPE'),
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2