Some more bug fixes for the setup script.

Refs #6107

diff --git a/pki/icinga2-setup-agent.cmake b/pki/icinga2-setup-agent.cmake
index 37ad001d8c7d0ecde52f69c857730af6e92b2494..fc1a9f745440602162fc86432cb421ac1326d675 100644 (file)
--- a/pki/icinga2-setup-agent.cmake
+++ b/pki/icinga2-setup-agent.cmake
@@ -133,16 +133,6 @@ object ApiListener "api" {
 
 object Endpoint NodeName {
   host = NodeName
-
-AGENT
-
-       if [ "$master" = "n" ]; then
-               cat >>$ICINGA2CONFIG/features-available/api.conf <<AGENT
-  upstream_name = "$upstream_name"
-AGENT
-       fi
-
-       cat >>$ICINGA2CONFIG/features-available/api.conf <<AGENT
 }
 
 object Zone ZoneName {
@@ -173,6 +163,8 @@ object Zone "$upstream_name" {
 AGENT
        fi
 
+       sed -i "s/NodeName = \"localhost\"/NodeName = \"$name\"/" /etc/icinga2/constants.conf
+
        echo "Enabling API feature..."
        @CMAKE_INSTALL_FULL_SBINDIR@/icinga2-enable-feature api