File centreon-web-install-vars-for-steps.patch of Package centreon-web
diff -Pdpru centreon-web-19.10.5.orig/doc/en/administration_guide/poller/add_manually_a_poller.rst centreon-web-19.10.5/doc/en/administration_guide/poller/add_manually_a_poller.rst
--- centreon-web-19.10.5.orig/doc/en/administration_guide/poller/add_manually_a_poller.rst 2020-01-14 13:51:19.000000000 +0100
+++ centreon-web-19.10.5/doc/en/administration_guide/poller/add_manually_a_poller.rst 2020-02-05 08:54:47.280892798 +0100
@@ -45,7 +45,7 @@ Once the installation is complete, you m
/usr/lib64/centreon-engine/externalcmd.so
- /usr/lib64/nagios/cbmod.so /etc/centreon-broker/poller-module.xml
+ /usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/poller-module.xml
.. image:: /images/user/configuration/10advanced_configuration/07addpoller_neb.png
:align: center
diff -Pdpru centreon-web-19.10.5.orig/doc/en/api/clapi/objects/engine_cfg.rst centreon-web-19.10.5/doc/en/api/clapi/objects/engine_cfg.rst
--- centreon-web-19.10.5.orig/doc/en/api/clapi/objects/engine_cfg.rst 2020-01-14 13:51:19.000000000 +0100
+++ centreon-web-19.10.5/doc/en/api/clapi/objects/engine_cfg.rst 2020-02-05 08:54:36.592495866 +0100
@@ -87,7 +87,7 @@ nagios_name Name
instance Instance that is linked to centreon-engine.cfg
-broker_module example: [...] -v "Engine CFG NY;broker_module;/usr/lib64/nagios/cbmod.so /etc/centreon-broker/central-module.xml",
+broker_module example: [...] -v "Engine CFG NY;broker_module;/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/central-module.xml",
you can use a | delimiter for defining multiple broker modules
nagios_activate *1* if activated, *0* otherwise
diff -Pdpru centreon-web-19.10.5.orig/doc/fr/administration_guide/poller/add_manually_a_poller.rst centreon-web-19.10.5/doc/fr/administration_guide/poller/add_manually_a_poller.rst
--- centreon-web-19.10.5.orig/doc/fr/administration_guide/poller/add_manually_a_poller.rst 2020-01-14 13:51:18.000000000 +0100
+++ centreon-web-19.10.5/doc/fr/administration_guide/poller/add_manually_a_poller.rst 2020-02-05 08:54:23.848022575 +0100
@@ -46,7 +46,7 @@ Une fois l'installation réalisée, il f
/usr/lib64/centreon-engine/externalcmd.so
- /usr/lib64/nagios/cbmod.so /etc/centreon-broker/poller-module.xml
+ /usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/poller-module.xml
.. image:: /images/guide_utilisateur/configuration/10advanced_configuration/07addpoller_neb.png
:align: center
diff -Pdpru centreon-web-19.10.5.orig/doc/fr/api/clapi/objects/engine_cfg.rst centreon-web-19.10.5/doc/fr/api/clapi/objects/engine_cfg.rst
--- centreon-web-19.10.5.orig/doc/fr/api/clapi/objects/engine_cfg.rst 2020-01-14 13:51:18.000000000 +0100
+++ centreon-web-19.10.5/doc/fr/api/clapi/objects/engine_cfg.rst 2020-02-05 08:54:10.503527006 +0100
@@ -86,7 +86,7 @@ nagios_name Name
instance Instance that is linked to engine.cfg
-broker_module example: [...] -v "Engine CFG 1;broker_module;/usr/lib64/nagios/cbmod.so /etc/centreon-broker/central-module.xml",
+broker_module example: [...] -v "Engine CFG 1;broker_module;/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/central-module.xml",
you can use a | delimiter for defining multiple broker modules
nagios_activate *1* if activated, *0* otherwise
diff -Pdpru centreon-web-19.10.5.orig/src/Centreon/Infrastructure/Service/CentcoreConfigService.php centreon-web-19.10.5/src/Centreon/Infrastructure/Service/CentcoreConfigService.php
--- centreon-web-19.10.5.orig/src/Centreon/Infrastructure/Service/CentcoreConfigService.php 2020-01-14 13:51:17.000000000 +0100
+++ centreon-web-19.10.5/src/Centreon/Infrastructure/Service/CentcoreConfigService.php 2020-02-05 08:53:59.295110759 +0100
@@ -91,7 +91,7 @@ class CentcoreConfigService
'centreonbroker_lib' => '/usr/share/centreon/lib/centreon-broker',
'centreonbroker_varlib' => '/var/lib/centreon-broker',
'centreonbroker_log' => '/var/log/centreon-broker',
- 'centreonbroker_cbmod' => '/usr/lib64/nagios/cbmod.so',
+ 'centreonbroker_cbmod' => '/usr/lib64/centreon-broker/cbmod.so',
'centreonbroker_etc' => '/etc/centreon-broker',
'centreonplugins' => '/usr/lib/centreon/plugins',
'centreon_plugins' => '/usr/lib/centreon/plugins',
diff -Pdpru centreon-web-19.10.5.orig/src/CentreonRemote/Domain/Resources/RemoteConfig/CfgNagiosBrokerModule.php centreon-web-19.10.5/src/CentreonRemote/Domain/Resources/RemoteConfig/CfgNagiosBrokerModule.php
--- centreon-web-19.10.5.orig/src/CentreonRemote/Domain/Resources/RemoteConfig/CfgNagiosBrokerModule.php 2020-01-14 13:51:17.000000000 +0100
+++ centreon-web-19.10.5/src/CentreonRemote/Domain/Resources/RemoteConfig/CfgNagiosBrokerModule.php 2020-02-05 08:53:44.922577012 +0100
@@ -22,7 +22,7 @@ class CfgNagiosBrokerModule
return [
[
'cfg_nagios_id' => $configID,
- 'broker_module' => "/usr/lib64/nagios/cbmod.so /etc/centreon-broker/{$pollerName}-module.xml",
+ 'broker_module' => "/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/{$pollerName}-module.xml",
],
[
'cfg_nagios_id' => $configID,
diff -Pdpru centreon-web-19.10.5.orig/tests/clapi_export/clapi-configuration.txt centreon-web-19.10.5/tests/clapi_export/clapi-configuration.txt
--- centreon-web-19.10.5.orig/tests/clapi_export/clapi-configuration.txt 2020-01-14 13:51:17.000000000 +0100
+++ centreon-web-19.10.5/tests/clapi_export/clapi-configuration.txt 2020-02-05 08:52:36.664042118 +0100
@@ -631,7 +631,7 @@ ENGINECFG;setparam;Centreon Engine Centr
ENGINECFG;setparam;Centreon Engine Central;cfg_file;centengine.cfg
ENGINECFG;setparam;Centreon Engine Central;log_pid;1
ENGINECFG;setparam;Centreon Engine Central;enable_macros_filter;0
-ENGINECFG;setparam;Centreon Engine Central;broker_module;/usr/lib64/centreon-engine/externalcmd.so|/usr/lib64/nagios/cbmod.so /etc/centreon-broker/central-module.xml
+ENGINECFG;setparam;Centreon Engine Central;broker_module;/usr/lib64/centreon-engine/externalcmd.so|/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/central-module.xml
ENGINECFG;ADD;Centreon Engine Central_1;test_poller;Centreon Engine
ENGINECFG;setparam;Centreon Engine Central_1;log_file;/var/log/centreon-engine/centengine.log
ENGINECFG;setparam;Centreon Engine Central_1;cfg_dir;/etc/centreon-engine
@@ -716,7 +716,7 @@ ENGINECFG;setparam;Centreon Engine Centr
ENGINECFG;setparam;Centreon Engine Central_1;cfg_file;centengine.cfg
ENGINECFG;setparam;Centreon Engine Central_1;log_pid;1
ENGINECFG;setparam;Centreon Engine Central_1;enable_macros_filter;0
-ENGINECFG;setparam;Centreon Engine Central_1;broker_module;/usr/lib64/centreon-engine/externalcmd.so|/usr/lib64/nagios/cbmod.so /etc/centreon-broker/central-module.xml
+ENGINECFG;setparam;Centreon Engine Central_1;broker_module;/usr/lib64/centreon-engine/externalcmd.so|/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/central-module.xml
CONTACTTPL;ADD;contact_template;contact_template;;md5__d41d8cd98f00b204e9800998ecf8427e;0;1;;local
CONTACTTPL;setparam;contact_template;hostnotifopt;n
CONTACTTPL;setparam;contact_template;servicenotifopt;n
diff -Pdpru centreon-web-19.10.5.orig/www/class/centreon-config/centreonMainCfg.class.php centreon-web-19.10.5/www/class/centreon-config/centreonMainCfg.class.php
--- centreon-web-19.10.5.orig/www/class/centreon-config/centreonMainCfg.class.php 2020-01-14 13:51:20.000000000 +0100
+++ centreon-web-19.10.5/www/class/centreon-config/centreonMainCfg.class.php 2020-02-05 08:52:58.672859450 +0100
@@ -86,7 +86,7 @@ class CentreonMainCfg
{
$this->aDefaultBrokerDirective = array(
'ui' => '/usr/lib64/centreon-engine/externalcmd.so',
- 'wizard' => '/usr/lib64/nagios/cbmod.so /etc/centreon-broker/poller-module.xml'
+ 'wizard' => '/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/poller-module.xml'
);
}
diff -Pdpru centreon-web-19.10.5.orig/www/include/configuration/configNagios/formNagios.php centreon-web-19.10.5/www/include/configuration/configNagios/formNagios.php
--- centreon-web-19.10.5.orig/www/include/configuration/configNagios/formNagios.php 2020-01-14 13:51:21.000000000 +0100
+++ centreon-web-19.10.5/www/include/configuration/configNagios/formNagios.php 2020-02-05 08:53:15.373479656 +0100
@@ -79,7 +79,7 @@ if ($o != "a") {
$dirArray = $mainCfg->getBrokerDirectives(isset($nagios_id) ? $nagios_id : null);
} else {
$dirArray[0]['in_broker_#index#'] = "/usr/lib64/centreon-engine/externalcmd.so";
- $dirArray[1]['in_broker_#index#'] = "/usr/lib64/nagios/cbmod.so /etc/centreon-broker/poller-module.xml";
+ $dirArray[1]['in_broker_#index#'] = "/usr/lib64/centreon-broker/cbmod.so /etc/centreon-broker/poller-module.xml";
}
$cdata->addJsData(
'clone-values-broker',
diff -Pdpru centreon-web-19.10.5.orig/www/install/install.conf.dist.php centreon-web-19.10.5/www/install/install.conf.dist.php
--- centreon-web-19.10.5.orig/www/install/install.conf.dist.php 2020-01-14 13:51:20.000000000 +0100
+++ centreon-web-19.10.5/www/install/install.conf.dist.php 2020-02-05 08:53:31.470077430 +0100
@@ -23,5 +23,5 @@ $conf_centreon['monitoring_varlog'] = "/
$conf_centreon['plugin_dir'] = "/usr/lib/nagios/plugins";
$conf_centreon['centreon_engine_connectors'] = "/usr/lib64/centreon-connector";
$conf_centreon['centreon_engine_lib'] = "/usr/lib64/centreon-engine";
-$conf_centreon['centreonbroker_cbmod'] = "/usr/lib64/nagios/cbmod.so";
+$conf_centreon['centreonbroker_cbmod'] = "/usr/lib64/centreon-broker/cbmod.so";
$conf_centreon['centreon_plugins'] = "/usr/lib/centreon/plugins";
diff -Pdpru centreon-web-19.10.5.orig/www/install/var/brokers/centreon-broker centreon-web-19.10.5/www/install/var/brokers/centreon-broker
--- centreon-web-19.10.5.orig/www/install/var/brokers/centreon-broker 2020-01-14 13:51:20.000000000 +0100
+++ centreon-web-19.10.5/www/install/var/brokers/centreon-broker 2020-02-05 08:50:42.295794885 +0100
@@ -4,7 +4,7 @@
# column 4 => 0:directory, 1: file
# column 5 => default value
CENTREONBROKER_ETC;Centreon Broker etc directory;1;0;/etc/centreon-broker
-CENTREONBROKER_CBMOD;Centreon Broker module (cbmod.so);0;1;/usr/lib64/nagios/cbmod.so
+CENTREONBROKER_CBMOD;Centreon Broker module (cbmod.so);0;1;/usr/lib64/centreon-broker/cbmod.so
CENTREONBROKER_LOG;Centreon Broker log directory;1;0;/var/log/centreon-broker
CENTREONBROKER_VARLIB;Retention file directory;1;0;/var/lib/centreon-broker
-CENTREONBROKER_LIB;Centreon Broker lib (*.so) directory;1;0;/usr/share/centreon/lib/centreon-broker
\ Kein Zeilenumbruch am Dateiende.
+CENTREONBROKER_LIB;Centreon Broker lib (*.so) directory;1;0;/usr/lib64/centreon-broker
