From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Mon, 29 Jan 2018 13:23:53 +0000 (+0100)
Subject: Remove need for init.conf
X-Git-Tag: v2.8.2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3970662bf4fb76dab0c194b029aeb88f81854fe0;p=icinga2

Remove need for init.conf
---

diff --git a/doc/17-language-reference.md b/doc/17-language-reference.md
index 794f42839..4afdb522e 100644
--- a/doc/17-language-reference.md
+++ b/doc/17-language-reference.md
@@ -389,8 +389,8 @@ ObjectsPath         |**Read-write.** Contains the path of the Icinga 2 objects f
 PidPath             |**Read-write.** Contains the path of the Icinga 2 PID file. Defaults to RunDir + "/icinga2/icinga2.pid".
 Vars                |**Read-write.** Contains a dictionary with global custom attributes. Not set by default.
 NodeName            |**Read-write.** Contains the cluster node name. Set to the local hostname by default.
-RunAsUser           |**Read-write.** Defines the user the Icinga 2 daemon is running as. Used in the `init.conf` configuration file.
-RunAsGroup          |**Read-write.** Defines the group the Icinga 2 daemon is running as. Used in the `init.conf` configuration file.
+RunAsUser           |**Read-write.** Defines the user the Icinga 2 daemon is running as. Set in the Icinga 2 sysconfig.
+RunAsGroup          |**Read-write.** Defines the group the Icinga 2 daemon is running as. Set in the Icinga 2 sysconfig.
 PlatformName        |**Read-only.** The name of the operating system, e.g. "Ubuntu".
 PlatformVersion     |**Read-only.** The version of the operating system, e.g. "14.04.3 LTS".
 PlatformKernel      |**Read-only.** The name of the operating system kernel, e.g. "Linux".
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index f6b005d25..83903093c 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -15,8 +15,6 @@
 # along with this program; if not, write to the Free Software Foundation
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-configure_file(icinga2/init.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf @ONLY)
-
 if(NOT WIN32)
   configure_file(icinga2/constants.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf @ONLY)
 endif()
@@ -25,8 +23,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY)
 endif()
 
-install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
-
 if(NOT WIN32)
   install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 	install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
diff --git a/etc/icinga2/init.conf.cmake b/etc/icinga2/init.conf.cmake
deleted file mode 100644
index 22406a998..000000000
--- a/etc/icinga2/init.conf.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * This file is read by Icinga 2 before the main
- * configuration file (icinga2.conf) is processed.
- */
-
diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 368906876..a8caaabea 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -154,22 +154,61 @@ int Main(void)
 
 	Application::DeclareZonesDir(Application::GetSysconfDir() + "/icinga2/zones.d");
 
-	String icinga_user = Utility::GetFromSysconfig("ICINGA2_USER");
-	if (icinga_user.IsEmpty())
-		icinga_user = ICINGA_USER;
-
-	String icinga_group = Utility::GetFromSysconfig("ICINGA2_GROUP");
-	if (icinga_group.IsEmpty())
-		icinga_group = ICINGA_GROUP;
-
-	Application::DeclareRunAsUser(icinga_user);
-	Application::DeclareRunAsGroup(icinga_group);
-#ifdef __linux__
-	Application::DeclareRLimitFiles(Application::GetDefaultRLimitFiles());
-	Application::DeclareRLimitProcesses(Application::GetDefaultRLimitProcesses());
-	Application::DeclareRLimitStack(Application::GetDefaultRLimitStack());
-#endif /* __linux__ */
-	Application::DeclareConcurrency(boost::thread::hardware_concurrency());
+	String icingaUser = Utility::GetFromSysconfig("ICINGA2_USER");
+	if (icingaUser.IsEmpty())
+		icingaUser = ICINGA_USER;
+
+	String icingaGroup = Utility::GetFromSysconfig("ICINGA2_GROUP");
+	if (icingaGroup.IsEmpty())
+		icingaGroup = ICINGA_GROUP;
+
+	Application::DeclareRunAsUser(icingaUser);
+	Application::DeclareRunAsGroup(icingaGroup);
+
+#ifdef RLIMIT_NOFILE
+	String rLimitFiles = Utility::GetFromSysconfig("ICINGA2_RLIMIT_FILES");
+	if (rLimitFiles.IsEmpty())
+		Application::DeclareRLimitFiles(Application::GetDefaultRLimitFiles());
+	else {
+		try {
+			Application::DeclareRLimitFiles(Convert::ToLong(rLimitFiles));
+		} catch (const std::invalid_argument& ex) {
+			std::cout
+				<< "Error while parsing \"ICINGA2_RLIMIT_FILES\" from sysconfig: " << ex.what() << '\n';
+			return EXIT_FAILURE;
+		}
+	}
+#endif /* RLIMIT_NOFILE */
+
+#ifdef RLIMIT_NPROC
+	String rLimitProcesses = Utility::GetFromSysconfig("ICINGA2_RLIMIT_PROCESSES");
+	if (rLimitProcesses.IsEmpty())
+		Application::DeclareRLimitProcesses(Application::GetDefaultRLimitProcesses());
+	else {
+		try {
+			Application::DeclareRLimitProcesses(Convert::ToLong(rLimitProcesses));
+		} catch (const std::invalid_argument& ex) {
+			std::cout
+				<< "Error while parsing \"ICINGA2_RLIMIT_PROCESSES\" from sysconfig: " << ex.what() << '\n';
+			return EXIT_FAILURE;
+		}
+	}
+#endif /* RLIMIT_NPROC */
+
+#ifdef RLIMIT_STACK
+	String rLimitStack = Utility::GetFromSysconfig("ICINGA2_RLIMIT_STACK");
+	if (rLimitStack.IsEmpty())
+		Application::DeclareRLimitStack(Application::GetDefaultRLimitStack());
+	else {
+		try {
+			Application::DeclareRLimitStack(Convert::ToLong(rLimitStack));
+		} catch (const std::invalid_argument& ex) {
+			std::cout
+				<< "Error while parsing \"ICINGA2_RLIMIT_STACK\" from sysconfig: " << ex.what() << '\n';
+			return EXIT_FAILURE;
+		}
+	}
+#endif /* RLIMIT_STACK */
 
 	ScriptGlobal::Set("AttachDebugger", false);