From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 18 Nov 2014 15:48:58 +0000 (+0100)
Subject: Fix another incorrect argument name
X-Git-Tag: v2.3.0~666
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbaece61e7929d97cf4dac0d62c616d12127fc2b;p=icinga2

Fix another incorrect argument name

refs #7726
---

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index a5dd4fbd8..bfca1f116 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -59,7 +59,10 @@ install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_
 install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d)
 install_if_not_exists(icinga2/repository.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/repository.d)
-install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d)
+endif()
 
 install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/pki\")")
 install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/repository.d\")")
diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index c1f18217e..4200df643 100644
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -476,7 +476,7 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
 
 	Log(LogInformation, "cli", "Generating zone and object configuration.");
 
-	NodeUtility::GenerateNodeIcingaConfig(vm["endpoint"].as<std::vector<std::string> >(), cn, vm["node"].as<std::string>());
+	NodeUtility::GenerateNodeIcingaConfig(vm["endpoint"].as<std::vector<std::string> >(), cn, vm["zone"].as<std::string>());
 
 	/* update constants.conf with NodeName = CN */
 	if (cn != Utility::GetFQDN()) {