From e03ffd780a00543b29ef898d6020c6aff3d6b6a6 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 21 Oct 2013 21:03:35 +0200 Subject: [PATCH] Update documentation. --- doc/2.1-setting-up-icinga-2.md | 5 ++++- doc/2.6-running-icinga.md | 2 +- doc/3.10-logging.md | 2 +- tools/migration/README | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md index 3720c0004..ed28a38b5 100644 --- a/doc/2.1-setting-up-icinga-2.md +++ b/doc/2.1-setting-up-icinga-2.md @@ -21,7 +21,7 @@ are available for your favorite distribution. > > RHEL/CentOS 5 packages require the [EPEL repository](http://fedoraproject.org/wiki/EPEL) > enabled (which provides the `boost141` package). SLES 11 SP3 and older versions -> require the `boost_1_54_0` package (available on [packages.icinga.org]). +> require the `boost_1_54_0` package (available on http://packages.icinga.org). You can install Icinga 2 by using your distribution's package manager to install the `icinga2` package. @@ -52,12 +52,15 @@ By default Icinga 2 uses the following files and directories: ------------------------------------|------------------------------------ /etc/icinga2 | Contains Icinga 2 configuration files. /etc/init.d/icinga2 | The Icinga 2 init script. + /usr/bin/icinga2-* | Migration and certificate build scripts. + /usr/sbin/icinga2* | The Icinga 2 binary and feature enable/disable scripts. /usr/share/doc/icinga2 | Documentation files that come with Icinga 2. /usr/share/icinga2/itl | The Icinga Template Library. /var/run/icinga2 | PID file. /var/run/icinga2/cmd | Command pipe and Livestatus socket. /var/cache/icinga2 | Performance data files and status.dat/objects.cache. /var/lib/icinga2 | The Icinga 2 state file. + /var/log/icinga2 | Log file location and compat/ directory for the CompatLogger feature. ### icinga2.conf diff --git a/doc/2.6-running-icinga.md b/doc/2.6-running-icinga.md index 07b350550..877743ac2 100644 --- a/doc/2.6-running-icinga.md +++ b/doc/2.6-running-icinga.md @@ -18,7 +18,7 @@ Icinga 2's init script is installed in `/etc/init.d/icinga2` by default: > **Note** > -> By default the Icinga 2 daemon is running as `icinga` user and group. +> By default the Icinga 2 daemon is running as `icinga` user and group > using the init script. Using Debian packages the user and group are set to `nagios` > for historical reasons. diff --git a/doc/3.10-logging.md b/doc/3.10-logging.md index 8f4f15ddc..973279888 100644 --- a/doc/3.10-logging.md +++ b/doc/3.10-logging.md @@ -26,7 +26,7 @@ and forward the `debug` serverity into an Icinga 2 debug file. } If you're starting Icinga 2 not as daemon, but in foreground -using `/usr/bin/icinga2 -c /etc/icinga2/icinga2.conf` you may +using `/usr/sbin/icinga2 -c /etc/icinga2/icinga2.conf` you may want to enable console logging temporary too. object ConsoleLogger "debug-console" { diff --git a/tools/migration/README b/tools/migration/README index 728dad8e8..84d01b1b6 100644 --- a/tools/migration/README +++ b/tools/migration/README @@ -39,18 +39,18 @@ All required templates will be inherited from Icinga2's Template Library (ITL). Regular expressions are not supported, also for the reason that this is optional in Icinga 1.x RUN -# /usr/sbin/icinga2-migrate-config -c /etc/icinga/icinga.cfg -o conf/ +# /usr/bin/icinga2-migrate-config -c /etc/icinga/icinga.cfg -o conf/ HELP -# /usr/sbin/icinga2-migrate-config -h +# /usr/bin/icinga2-migrate-config -h VERBOSE -# /usr/sbin/icinga2-migrate-config -v -c /etc/icinga/icinga.cfg -o conf/ +# /usr/bin/icinga2-migrate-config -v -c /etc/icinga/icinga.cfg -o conf/ TEST There's a small icinga2 conversion test config available, including conf/ folder. -# /usr/bin/icinga2 -c icinga2-conv.conf +# /usr/sbin/icinga2 -c icinga2-conv.conf REQUIREMENTS