From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Wed, 4 Apr 2018 11:53:18 +0000 (+0200)
Subject: Remove init.conf from icinga.cpp
X-Git-Tag: v2.8.3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b488eb00ff9e4903858ced1c9e27bd680e64c5a;p=icinga2

Remove init.conf from icinga.cpp
---

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index a8caaabea..31f6dc3d4 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -222,25 +222,6 @@ int Main(void)
 	ScriptGlobal::Set("BuildCompilerName", ICINGA_BUILD_COMPILER_NAME);
 	ScriptGlobal::Set("BuildCompilerVersion", ICINGA_BUILD_COMPILER_VERSION);
 
-	String initconfig = Application::GetSysconfDir() + "/icinga2/init.conf";
-
-	if (Utility::PathExists(initconfig)) {
-		Expression *expression;
-		try {
-			expression = ConfigCompiler::CompileFile(initconfig);
-
-			ScriptFrame frame;
-			expression->Evaluate(frame);
-		} catch (const std::exception& ex) {
-			delete expression;
-
-			Log(LogCritical, "config", DiagnosticInformation(ex));
-			return EXIT_FAILURE;
-		}
-
-		delete expression;
-	}
-
 	if (!autocomplete)
 		Application::SetResourceLimits();