Some more bug fixes for the setup script.

Refs #6107
This commit is contained in:
Gunnar Beutner 2014-05-12 15:55:04 +02:00
parent 9864af3d12
commit f50306f3a3
1 changed files with 2 additions and 10 deletions

View File

@ -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