tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix configuration error on missing NodeName." 

This reverts commit 72ef0d31fd.

Refs #6393
This commit is contained in:
Michael Friedrich 2014-06-04 10:23:39 +02:00
parent 1d9f7fb045
commit 63df43eea2
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/2-getting-started.md
View File

@ -157,10 +157,7 @@ The `constants.conf` configuration file can be used to define global constants:
/* The directory which contains the plugins from the Monitoring Plugins project. */ /* The directory which contains the plugins from the Monitoring Plugins project. */
const PluginDir = "/usr/lib/nagios/plugins" const PluginDir = "/usr/lib/nagios/plugins"
/* Our local instance name. This should be the common name /* Our local instance name. This should be the common name from the API certificate */
* from the API certificate. Not required for a single
* instance setup.
*/
const NodeName = "localhost" const NodeName = "localhost"
/* Our local zone name. */ /* Our local zone name. */

9
etc/icinga2/constants.conf
View File

@ -6,11 +6,10 @@
/* The directory which contains the plugins from the Monitoring Plugins project. */ /* The directory which contains the plugins from the Monitoring Plugins project. */
const PluginDir = "/usr/lib/nagios/plugins" const PluginDir = "/usr/lib/nagios/plugins"
/* Our local instance name. This should be the common name /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
* from the API certificate. Not required for a single * This should be the common name from the API certificate.
* instance setup. */
*/ //const NodeName = "localhost"
const NodeName = "localhost"
/* Our local zone name. */ /* Our local zone name. */
const ZoneName = NodeName const ZoneName = NodeName