Update to 1.3.3

12 files changed, 163 insertions, 57 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index 068046669fb2..a7082454036e 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
-DISTVERSION=	2.2.4
+DISTVERSION=	2.3.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/
 
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index a014a16519c9..5764e0e02388 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icinga2-2.2.4.tar.gz) = 0329e7ad10e5716407653eb73c2545616a633d7a70c6b7fcc2df9953169ee9aa
-SIZE (icinga2-2.2.4.tar.gz) = 691978
+SHA256 (icinga2-2.3.3.tar.gz) = c2310acd872adc027b050a55ed98e9891cc3ff19b2c431c8290d005d03a04b1a
+SIZE (icinga2-2.3.3.tar.gz) = 777211
diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt
index 2a5b562abb2f..f2f1511c1eb2 100644
--- a/net-mgmt/icinga2/files/patch-CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt
@@ -1,13 +1,13 @@
---- CMakeLists.txt.orig	2014-11-24 21:13:28.953855765 +0100
-+++ CMakeLists.txt	2014-11-24 21:13:39.486871283 +0100
-@@ -28,8 +28,8 @@
+--- CMakeLists.txt.orig	2015-03-26 09:50:40.000000000 +0100
++++ CMakeLists.txt	2015-03-26 20:40:12.055624000 +0100
+@@ -28,8 +28,8 @@ if(NOT CMAKE_BUILD_TYPE)
        FORCE)
  endif()
  
--option(ICINGA2_WITH_MYSQL "MySQL support" ON)
--option(ICINGA2_WITH_PGSQL "PostgreSQL support" ON)
-+option(ICINGA2_WITH_MYSQL "MySQL support" OFF)
-+option(ICINGA2_WITH_PGSQL "PostgreSQL support" OFF)
- 
- file(STRINGS icinga2.spec VERSION_LINE REGEX "^Version: ")
- string(REPLACE "Version: " "" ICINGA2_VERSION ${VERSION_LINE})
+-option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" ON)
+-option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" ON)
++option(ICINGA2_WITH_MYSQL "Build the MySQL IDO module" OFF)
++option(ICINGA2_WITH_PGSQL "Build the PostgreSQL IDO module" OFF)
+ option(ICINGA2_WITH_CHECKER "Build the checker module" ON)
+ option(ICINGA2_WITH_COMPAT "Build the compat module" ON)
+ option(ICINGA2_WITH_DEMO "Build the demo module" OFF)
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index 9a71eb5ebc02..ecf63c53a5fd 100644
--- a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
@@ -1,6 +1,6 @@
---- etc/CMakeLists.txt.orig	2014-12-01 13:30:51.000000000 +0100
-+++ etc/CMakeLists.txt	2014-12-10 17:00:02.582959152 +0100
-@@ -28,50 +28,50 @@
+--- etc/CMakeLists.txt.orig	2015-03-26 09:50:40.000000000 +0100
++++ etc/CMakeLists.txt	2015-03-26 20:46:49.751242000 +0100
+@@ -26,39 +26,39 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
    configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY)
  endif()
  
@@ -13,7 +13,8 @@
 -  install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 +  install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
  else()
-   install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
+-  install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
++  install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
  endif()
  
 -install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
@@ -39,20 +40,9 @@
 -install_if_not_exists(icinga2/conf.d/timeperiods.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/conf.d/users.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/features-available/api.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/checker.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/command.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/compatlog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 -install_if_not_exists(icinga2/features-available/debuglog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/gelf.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/graphite.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 -install_if_not_exists(icinga2/features-available/icingastatus.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/ido-mysql.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/ido-pgsql.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/livestatus.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 -install_if_not_exists(icinga2/features-available/mainlog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/notification.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/perfdata.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
--install_if_not_exists(icinga2/features-available/statusdata.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 -install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 -install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 -install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
@@ -63,20 +53,9 @@
 +install_if_not_exists(icinga2/conf.d/timeperiods.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/conf.d/users.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/features-available/api.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/checker.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/command.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/compatlog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 +install_if_not_exists(icinga2/features-available/debuglog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/gelf.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/graphite.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 +install_if_not_exists(icinga2/features-available/icingastatus.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/ido-mysql.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/ido-pgsql.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/livestatus.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 +install_if_not_exists(icinga2/features-available/mainlog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/notification.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/perfdata.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
-+install_if_not_exists(icinga2/features-available/statusdata.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 +install_if_not_exists(icinga2/features-available/syslog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available)
 +install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
 +install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts)
diff --git a/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
new file mode 100644
index 000000000000..7aba163577cb
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/checker/CMakeLists.txt.orig	2015-03-26 21:20:09.330968000 +0100
++++ lib/checker/CMakeLists.txt	2015-03-26 21:20:26.783894000 +0100
+@@ -38,7 +38,7 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/checker.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
new file mode 100644
index 000000000000..2cb618f80758
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
@@ -0,0 +1,23 @@
+--- lib/compat/CMakeLists.txt.orig	2015-03-26 22:05:37.746370000 +0100
++++ lib/compat/CMakeLists.txt	2015-03-26 22:05:53.107180000 +0100
+@@ -43,17 +43,17 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/command.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/compatlog.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/statusdata.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_db_ido_mysql_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_db_ido_mysql_CMakeLists.txt
new file mode 100644
index 000000000000..74bed5f772a1
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_db_ido_mysql_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/db_ido_mysql/CMakeLists.txt.orig	2015-03-26 22:17:27.671671000 +0100
++++ lib/db_ido_mysql/CMakeLists.txt	2015-03-26 22:17:38.242327000 +0100
+@@ -42,7 +42,7 @@ if(MYSQL_FOUND)
+   )
+ 
+   install_if_not_exists(
+-    ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf
++    ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-mysql.conf.sample
+     ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+   )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_db_ido_pgsql_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_db_ido_pgsql_CMakeLists.txt
new file mode 100644
index 000000000000..377d30826421
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_db_ido_pgsql_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/db_ido_pgsql/CMakeLists.txt.orig	2015-03-26 22:16:57.945333000 +0100
++++ lib/db_ido_pgsql/CMakeLists.txt	2015-03-26 22:17:17.498830000 +0100
+@@ -44,7 +44,7 @@ if(PostgreSQL_FOUND)
+   )
+ 
+   install_if_not_exists(
+-    ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf
++    ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/ido-pgsql.conf.sample
+     ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+   )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
new file mode 100644
index 000000000000..1a89705a8fb1
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/livestatus/CMakeLists.txt.orig	2015-03-26 22:21:52.808117000 +0100
++++ lib/livestatus/CMakeLists.txt	2015-03-26 22:22:17.663409000 +0100
+@@ -49,7 +49,7 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/livestatus.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
new file mode 100644
index 000000000000..8f2f47c19b41
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- lib/notification/CMakeLists.txt.orig	2015-03-26 22:23:26.170689000 +0100
++++ lib/notification/CMakeLists.txt	2015-03-26 22:23:41.985022000 +0100
+@@ -38,7 +38,7 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/notification.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
diff --git a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
new file mode 100644
index 000000000000..cb187304c4d3
--- /dev/null
+++ b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
@@ -0,0 +1,29 @@
+--- lib/perfdata/CMakeLists.txt.orig	2015-03-26 22:24:35.550156000 +0100
++++ lib/perfdata/CMakeLists.txt	2015-03-26 22:24:49.596242000 +0100
+@@ -41,22 +41,22 @@ set_target_properties (
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/gelf.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/graphite.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/opentsdb.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
+ install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/perfdata.conf.sample
+   ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
+ )
+ 
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index a7a3b124e3ed..3fbdc8a449f6 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -18,11 +18,12 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/features-available/gelf.conf.sample
 @sample %%ETCDIR%%/features-available/graphite.conf.sample
 @sample %%ETCDIR%%/features-available/icingastatus.conf.sample
-@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample
+%%MYSQL%%@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample
 @sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample
 @sample %%ETCDIR%%/features-available/livestatus.conf.sample
 @sample %%ETCDIR%%/features-available/mainlog.conf.sample
 @sample %%ETCDIR%%/features-available/notification.conf.sample
+@sample %%ETCDIR%%/features-available/opentsdb.conf.sample
 @sample %%ETCDIR%%/features-available/perfdata.conf.sample
 @sample %%ETCDIR%%/features-available/statusdata.conf.sample
 @sample %%ETCDIR%%/features-available/syslog.conf.sample
@@ -44,9 +45,7 @@ lib/icinga2/libconfig.so
 lib/icinga2/libdb_ido.so
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
-lib/icinga2/libdemo.so
 lib/icinga2/libexecvpe.so
-lib/icinga2/libhello.so
 lib/icinga2/libicinga.so
 lib/icinga2/liblivestatus.so
 lib/icinga2/libmethods.so
@@ -54,6 +53,7 @@ lib/icinga2/libmmatch.so
 lib/icinga2/libnotification.so
 lib/icinga2/libperfdata.so
 lib/icinga2/libremote.so
+lib/icinga2/libsocketpair.so
 man/man8/icinga2.8.gz
 sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -63,29 +63,48 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga2-client.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/11-agent-based-checks.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/12-distributed-monitoring-ha.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons-plugins.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/14-alternative-frontends.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/15-livestatus.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/16-troubleshooting.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/17-upgrading-icinga-2.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/18-migrating-from-icinga-1x.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/19-language-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/3-troubleshooting.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/4-monitoring-basics.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/5-monitoring-remote-systems.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/6-addons-plugins.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/7-configuring-icinga-2.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md
-%%MYSQL%%%%DATADIR%%-ido-mysql/schema/mysql.sql
-%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.0.2.sql
-%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.1.0.sql
-%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.2.0.sql
-%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/pgsql.sql
-%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
-%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
-%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
+%%PORTDOCS%%%%DOCSDIR%%/markdown/20-library-reference.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/21-debug.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/22-appendix.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/3-monitoring-basics.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/4-advanced-topics.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/5-configuring-icinga-2.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/6-object-types.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/7-icinga-template-library.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/8-cli-commands.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/9-monitoring-remote-systems.md
+%%DATADIR%%-ido-pgsql/schema/pgsql.sql
+%%DATADIR%%-ido-pgsql/schema/upgrade/2.0.2.sql
+%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql
+%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql
+%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql
 %%DATADIR%%/include/command-icinga.conf
+%%DATADIR%%/include/command-nscp-local.conf
 %%DATADIR%%/include/command-plugins-manubulon.conf
 %%DATADIR%%/include/command-plugins.conf
 %%DATADIR%%/include/command.conf
+%%DATADIR%%/include/hangman
 %%DATADIR%%/include/itl
 %%DATADIR%%/include/manubulon
+%%DATADIR%%/include/nscp
 %%DATADIR%%/include/plugins
+%%DATADIR%%/include/plugins-contrib
+%%DATADIR%%/include/plugins-contrib.d/ipmi.conf
+%%DATADIR%%/include/plugins-contrib.d/network-components.conf
+%%DATADIR%%/include/plugins-contrib.d/operating-system.conf
+%%DATADIR%%/include/plugins-contrib.d/virtualization.conf
+%%DATADIR%%/include/plugins-contrib.d/vmware.conf
 %%DATADIR%%/include/timeperiod.conf
 @dir %%ETCDIR%%/pki
 @dir /var/cache/icinga2
@@ -97,6 +116,7 @@ sbin/icinga2
 @dir /var/lib
 @dir /var/log/icinga2/compat/archives
 @dir /var/log/icinga2/compat
+@dir /var/log/icinga2/crash
 @dir /var/log/icinga2
 @dir /var/run/icinga2/cmd
 @dir /var/run/icinga2