LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File centreon-web-centreonbroker_module_path.patch of Package centreon-web (Project home:ecsos:monitoring)

Index: centreon-web-19.04.0/www/class/centreon-clapi/centreonInstance.class.php
===================================================================
--- centreon-web-19.04.0.orig/www/class/centreon-clapi/centreonInstance.class.php
+++ centreon-web-19.04.0/www/class/centreon-clapi/centreonInstance.class.php
@@ -64,12 +64,12 @@ class CentreonInstance extends CentreonO
             'localhost' => '0',
             'ns_activate' => '1',
             'ssh_port' => '22',
-            'nagios_bin' => '/usr/sbin/centengine',
-            'nagiostats_bin' => '/usr/bin/centenginestats',
-            'init_script' => 'centengine',
-            'centreonbroker_cfg_path' => '/etc/centreon-broker',
-            'centreonbroker_module_path' => '/usr/share/centreon/lib/centreon-broker',
-            'centreonconnector_path' => '/usr/lib64/centreon-connector'
+            'nagios_bin' => '@MONITORINGENGINE_BINARY@',
+            'nagiostats_bin' => '@MONITORINGENGINE_STATS_BINARY@',
+            'init_script' => '@MONITORINGENGINE_INIT_SCRIPT@',
+            'centreonbroker_cfg_path' => '@CENTREONBROKER_ETC@',
+            'centreonbroker_module_path' => '@CENTREONBROKER_MODULE_PATH@',
+            'centreonconnector_path' => '@CENTREONCONNECTOR_PATH@'
         );
         $this->insertParams = array('name', 'ns_ip_address', 'ssh_port');
         $this->exportExcludedParams = array_merge(
Index: centreon-web-19.04.0/www/include/configuration/configServers/formServers.php
===================================================================
--- centreon-web-19.04.0.orig/www/include/configuration/configServers/formServers.php
+++ centreon-web-19.04.0/www/include/configuration/configServers/formServers.php
@@ -209,10 +209,10 @@ $form->addElement('text', 'snmp_trapd_pa
  */
 if (isset($_GET["o"]) && $_GET["o"] == SERVER_ADD) {
     $monitoring_engines = array(
-        "nagios_bin" => "/usr/sbin/centengine",
-        "nagiostats_bin" => "/usr/sbin/centenginestats",
-        "init_script" => "centengine",
-        "nagios_perfdata" => "/var/log/centreon-engine/service-perfdata"
+        "nagios_bin" => "@MONITORINGENGINE_BINARY@",
+        "nagiostats_bin" => "@MONITORINGENGINE_STATS_BINARY@",
+        "init_script" => "@MONITORINGENGINE_INIT_SCRIPT@",
+        "nagios_perfdata" => "@MONITORINGENGINE_LOG@/service-perfdata"
     );
 
     $form->setDefaults(
@@ -230,11 +230,11 @@ if (isset($_GET["o"]) && $_GET["o"] == S
             "ssh_port"  =>  '22',
             "ssh_private_key"  =>  '~/.ssh/rsa.id',
             "nagios_perfdata"  => $monitoring_engines["nagios_perfdata"],
-            "centreonbroker_cfg_path" => "/etc/centreon-broker",
-            "centreonbroker_module_path" => "/usr/share/centreon/lib/centreon-broker",
-            "centreonbroker_logs_path" => "/var/log/centreon-broker",
-            "init_script_centreontrapd" => "centreontrapd",
-            "snmp_trapd_path_conf" => "/etc/snmp/centreon_traps/"
+            "centreonbroker_cfg_path" => "@CENTREONBROKER_ETC@",
+            "centreonbroker_module_path" => "@CENTREONBROKER_MODULE_PATH@",
+            "centreonbroker_logs_path" => "@CENTREONBROKER_LOG@",
+            "init_script_centreontrapd" => "@CENTREONTRAPD_INIT_SCRIPT@",
+            "snmp_trapd_path_conf" => "@CENTREONTRAPD_SNMP_PATH_CONF@/"
         )
     );
 } else {