Remove --user and --group

refs #7246

diff --git a/etc/icinga2/init.conf.cmake b/etc/icinga2/init.conf.cmake
index 50e7caeed72396ce7d9fca6c5188baa474803f65..9f57bca82ab1d23bded7562b8b6153f5d34980fc 100644 (file)
--- a/etc/icinga2/init.conf.cmake
+++ b/etc/icinga2/init.conf.cmake
@@ -1,2 +1,7 @@
+/**
+ * This file is read by Icinga 2 before the main
+ * configuration file (icinga2.conf) is processed.
+ */
+
 const RunAsUser = "@ICINGA2_USER@"
 const RunAsGroup = "@ICINGA2_GROUP@"

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index fb92037c773b87386e62859895085764e3285c86..5de35067ca00a3826478379112e9357b82c42910 100644 (file)
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -132,12 +132,7 @@ int Main(void)
                ("define,D", po::value<std::vector<std::string> >(), "define a constant")
                ("library,l", po::value<std::vector<std::string> >(), "load a library")
                ("include,I", po::value<std::vector<std::string> >(), "add include search directory")
-               ("log-level,x", po::value<std::string>(), "specify the log level for the console log")
-#ifndef _WIN32
-               ("user,u", po::value<std::string>(), "user to run Icinga as")
-               ("group,g", po::value<std::string>(), "group to run Icinga as")
-#endif /* _WIN32 */
-       ;
+               ("log-level,x", po::value<std::string>(), "specify the log level for the console log");
 
        po::options_description hiddenDesc("Hidden options");
 
@@ -179,12 +174,6 @@ int Main(void)
                }
        }
 
-       if (vm.count("group"))
-               ScriptVariable::Set("RunAsGroup", String(vm["group"].as<std::string>()));
-
-       if (vm.count("user"))
-               ScriptVariable::Set("RunAsUser", String(vm["user"].as<std::string>()));
-
 #ifndef _WIN32
        String group = Application::GetRunAsGroup();