Revert "Fix configuration error on missing NodeName."

This reverts commit 72ef0d31fd19ed20b2d5b986990a7be15011da09.

Refs #6393

diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md
index dd8bb9b2bcf258539cb113bc1ef36aba52b67dd2..9a3e844a20c83b423a623a97fbc7d0de3d3e7f6d 100644 (file)
--- a/doc/2-getting-started.md
+++ b/doc/2-getting-started.md
@@ -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. */
     const PluginDir = "/usr/lib/nagios/plugins"
 
-    /* Our local instance name. This should be the common name
-     * from the API certificate. Not required for a single
-     * instance setup.
-     */
+    /* Our local instance name. This should be the common name from the API certificate */
     const NodeName = "localhost"
 
     /* Our local zone name. */

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