Module: check_mk Branch: master Commit: a5894abba20aba7ea470cdc65d8de9b80d072c10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5894abba20aba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 26 08:22:34 2018 +0200 Removed useless "omd setup" target Change-Id: I1c24369db0b949c6b65267ad494991324c06310f --- omd/packages/omd/omd | 43 ------------------------------------------- omd/packages/omd/omd.8 | 14 -------------- 2 files changed, 57 deletions(-) diff --git a/omd/packages/omd/omd b/omd/packages/omd/omd index 643ad81..4f4f910 100644 --- a/omd/packages/omd/omd +++ b/omd/packages/omd/omd @@ -2476,43 +2476,6 @@ def main_help(args=[], options={}): " omd COMMAND -h, --help show available options of COMMAND\n" ) -def main_setup(args, options={}): - packages = g_info["OS_PACKAGES"].split() - install_cmd = g_info["PACKAGE_INSTALL"] - command = "%s %s" % (install_cmd, " ".join(packages)) - sys.stdout.write("Going to execute '%s'\n" % command) - if 0 == os.system(command): - ok() - - # Enable Apache modules - for mod in [ "proxy", "proxy_http", "rewrite" ]: - command = g_info["APACHE_ENMOD"] % mod - if 0 != os.system(command): - sys.stdout.write("ERROR: Could not enable Apache module mod_%s\n" % mod) - - # Activate init script of OMD and APACHE - for service in [ 'omd', g_info["APACHE_INIT_NAME"] ]: - sys.stdout.write("Activating init script for \"%s\"\n" % service) - command = g_info["ACTIVATE_INITSCRIPT"].replace("%s", service) - sys.stdout.write("Going to execute '%s'\n" % command) - if 0 != os.system(command): - sys.stdout.write("ERROR\n") - - # Create group 'omd' - if not group_exists('omd'): - sys.stdout.write("Creating new group 'omd'\n") - groupadd('omd') - - # set SUID bit for certain plugins (neccessary for - # non RPM/DEB installations (FIXME: find a more elegant - # solution later) - gid = group_id('omd') - for plugin in [ 'nagios/plugins/check_icmp', 'nagios/plugins/check_dhcp', - 'cmc/icmpsender', 'cmc/icmpreceiver' ]: - path = "/omd/versions/%s/lib/%s" % (OMD_VERSION, plugin) - os.chown(path, -1, gid) - os.chmod(path, 04750) - def main_uninstall(args, options={}): global g_sitename @@ -3870,12 +3833,6 @@ commands = [ "Show general help", ""), - ( "setup", True, False, 0, 0, True, "", main_setup, - [], - "Prepare operating system for OMD (installs packages)", - "We will install missing packages from your operating system and setup the\n" - "system apache daemon (add configuration files and modules needed by omd)\n"), - ( "uninstall", True, False, 0, 0, True, "", main_uninstall, [], "Remove OMD and all sites!", diff --git a/omd/packages/omd/omd.8 b/omd/packages/omd/omd.8 index c5e4d30..8aa60d4 100644 --- a/omd/packages/omd/omd.8 +++ b/omd/packages/omd/omd.8 @@ -68,20 +68,6 @@ This mainly updates the symlink \fB/omd/versions/default\fP. On debian based dis it calls update-alternatives to change the default versions. In this case there is a special option \fBauto\fP available to let update-alternatives choose the default OMD version. .TP -.B omd setup -Prepare operating system for OMD. This includes installing all software -packages from your linux distribution that the components of OMD need -to run properly. You need to make sure that a package installation via -aptitude/zypper/yum is possible. - -After installing missing packages a group \fBomd\fP will be created, -some Apache modules will be activated, the init script \fB/etc/init.d/omd\fP -will be activated and the SUID bits for some Nagios plugins will be -correctly configured (for the group omd). - -\fBNote:\fP If you have installed OMD via RPM or DEB and have installed -all packages the omd package depends on, no \fBomd setup\fP is neccessary. -.TP .B omd uninstall This deletes all software and data of OMD and its sites. That command is mainly used for trying out OMD or testing the installation of OMD. Be aware that