From 8d7f1ec9258de12f850bd0270e67c60cfbc26601 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 21 Feb 2014 09:31:37 +0100 Subject: [PATCH] Documentation: Fix duplicate installation path table. Refs #5619 --- doc/2.1-setting-up-icinga-2.md | 3 ++- doc/2.6-running-icinga-2.md | 22 ---------------------- doc/6-advanced-topics.md | 5 ----- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/doc/2.1-setting-up-icinga-2.md b/doc/2.1-setting-up-icinga-2.md index e4436af3e..d861a5cb5 100644 --- a/doc/2.1-setting-up-icinga-2.md +++ b/doc/2.1-setting-up-icinga-2.md @@ -59,7 +59,8 @@ By default Icinga 2 uses the following files and directories: /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/spool/icinga2 | Used for performance data spool files. + /var/lib/icinga2 | Icinga 2 state file, cluster feature replay log and configuration files. /var/log/icinga2 | Log file location and compat/ directory for the CompatLogger feature. ### icinga2.conf diff --git a/doc/2.6-running-icinga-2.md b/doc/2.6-running-icinga-2.md index 960dcb864..0c3eca0bf 100644 --- a/doc/2.6-running-icinga-2.md +++ b/doc/2.6-running-icinga-2.md @@ -115,25 +115,3 @@ You can disable features using the `icinga2-disable-feature` command: > The `icinga2-enable-feature` and `icinga2-disable-feature` commands do not restart Icinga 2. -### Runtime Locations - -This list describes the default package installation locations. Additional subdirectories -may be required. -These paths may differ depending on your installation method, or changed -[global constants](#global-constants) regarding path settings. - - Name | Description - --------------------------------------|-------------------------- - /etc/icinga2 | Icinga 2 configuration. - /usr/sbin/icinga2* | Icinga 2 daemon and feature enable/disable scripts. - /usr/bin/icinga2* | Helper scripts for Icinga 2. - /var/cache/icinga2 | Runtime files written such as status files. - /var/lib/icinga2 | Icinga 2 state file, cluster feature replay log and configuration files. - /var/log/icinga2 | Used for application, debug and compat log files. - /var/spool/icinga2 | Used for performance data spool files. - /var/run/icinga2 | Runtime data such as PID file, or ExternalCommandListener/LivestatusListener pipes/sockets. - /usr/lib/icinga2 | Icinga 2 Libraries. - /usr/share/icinga2 | [ITL](#itl) and [certificate helpers](#cluster). - /usr/share/doc/icinga2* | This documentation. - - diff --git a/doc/6-advanced-topics.md b/doc/6-advanced-topics.md index 9905b06e8..e6b0a7a9b 100644 --- a/doc/6-advanced-topics.md +++ b/doc/6-advanced-topics.md @@ -332,11 +332,6 @@ the Icinga 2 daemon. # icinga2 -c /etc/icinga2/node1/icinga2.conf -DIcingaLocalStateDir=/opt/node1/var -> **Note** -> -> You are required to ship the same directory layout known from a default -> Icinga 2 installation. Details in [Runtime Locations](#runtime-locations). - ## Dependencies Icinga 2 uses host and service dependencies as attribute directly on the host or -- 2.40.0