diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp index 0e462307c..404cedf30 100644 --- a/icinga-app/icinga.cpp +++ b/icinga-app/icinga.cpp @@ -143,7 +143,6 @@ static int Main() #endif /* _WIN32 */ Application::DeclarePrefixDir(ICINGA_PREFIX); - Application::DeclareSysconfigFile(ICINGA_SYSCONFIGFILE); Application::DeclareSysconfDir(ICINGA_SYSCONFDIR); Application::DeclareRunDir(ICINGA_RUNDIR); Application::DeclareLocalStateDir(ICINGA_LOCALSTATEDIR); @@ -155,13 +154,6 @@ static int Main() Application::DeclareZonesDir(Application::GetSysconfDir() + "/icinga2/zones.d"); -#ifndef _WIN32 - if (!autocomplete && !Utility::PathExists(Application::GetSysconfigFile())) { - Log(LogWarning, "icinga-app") - << "Sysconfig file '" << Application::GetSysconfigFile() << "' cannot be read. Using default values."; - } -#endif /* _WIN32 */ - String icingaUser = Utility::GetFromEnvironment("ICINGA2_USER"); if (icingaUser.IsEmpty()) icingaUser = ICINGA_USER; diff --git a/lib/base/application.cpp b/lib/base/application.cpp index 1ee51f88c..dec962e08 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -1325,27 +1325,6 @@ void Application::DeclareStatePath(const String& path) ScriptGlobal::Set("StatePath", path); } -/** - * Retrives the path of the sysconfig file. - * - * @returns The path. - */ -String Application::GetSysconfigFile(void) -{ - return ScriptGlobal::Get("SysconfigFile"); -} - -/** - * Sets the path of the sysconfig file. - * - * @param path The new path. - */ -void Application::DeclareSysconfigFile(const String& path) -{ - if (!ScriptGlobal::Exists("SysconfigFile")) - ScriptGlobal::Set("SysconfigFile", path); -} - /** * Retrieves the path for the modified attributes file. * diff --git a/lib/base/application.hpp b/lib/base/application.hpp index 03d83599b..7722d25f4 100644 --- a/lib/base/application.hpp +++ b/lib/base/application.hpp @@ -106,9 +106,6 @@ public: static String GetIncludeConfDir(); static void DeclareIncludeConfDir(const String& path); - static String GetSysconfigFile(void); - static void DeclareSysconfigFile(const String& path); - static String GetStatePath(void); static void DeclareStatePath(const String& path);