From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 12 May 2014 13:55:04 +0000 (+0200)
Subject: Some more bug fixes for the setup script.
X-Git-Tag: v0.0.11~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f50306f3a324c2f12c547215090d0f2c30f76075;p=icinga2

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 37ad001d8..fc1a9f745 100644
--- 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