13 files changed, 74 insertions, 67 deletions

diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index fca4295dbc11..46679379a5c7 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.7.2
+DISTVERSION=	2.8.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
-USES=		alias bison cmake libedit
+USES=		alias bison cmake libedit ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
@@ -32,7 +32,7 @@ OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
-OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
+OPTIONS_DEFAULT=	DOCS MYSQL PGSQL MONPLUGINS
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
diff --git a/net-mgmt/icinga2/distinfo b/net-mgmt/icinga2/distinfo
index ae2cf3bfa64f..be25389b9550 100644
--- a/net-mgmt/icinga2/distinfo
+++ b/net-mgmt/icinga2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511260564
-SHA256 (icinga-icinga2-v2.7.2_GH0.tar.gz) = 7e9691ad3389f04a53042d88c1ac8a37e2c9aaf8287856cad3fa48825adaee84
-SIZE (icinga-icinga2-v2.7.2_GH0.tar.gz) = 2471098
+TIMESTAMP = 1511186179
+SHA256 (icinga-icinga2-v2.8.0_GH0.tar.gz) = bdb1434dc1f502f350c659371c0920d68eeb982add0c5e94b5c16068dbef8fd0
+SIZE (icinga-icinga2-v2.8.0_GH0.tar.gz) = 2497043
diff --git a/net-mgmt/icinga2/files/patch-CMakeLists.txt b/net-mgmt/icinga2/files/patch-CMakeLists.txt
index 7ecd1e745e1f..41f771a51cb1 100644
--- a/net-mgmt/icinga2/files/patch-CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ CMakeLists.txt
+--- CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ CMakeLists.txt	2017-05-30 16:24:26.672731000 +0200
 @@ -28,8 +28,8 @@ if(NOT CMAKE_BUILD_TYPE)
        FORCE)
  endif()
diff --git a/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt b/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt
index b3c629d6d1c8..43557c8f379d 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	2016-08-17 14:19:24 UTC
-+++ etc/CMakeLists.txt
-@@ -26,43 +26,43 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
+--- etc/CMakeLists.txt.orig	2017-11-16 10:44:26.000000000 +0100
++++ etc/CMakeLists.txt	2017-11-20 17:15:33.564461000 +0100
+@@ -25,42 +25,42 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux"
    configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY)
  endif()
  
@@ -39,7 +39,6 @@
  endif()
  
 -install_if_not_exists(icinga2/conf.d/notifications.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
--install_if_not_exists(icinga2/conf.d/satellite.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -install_if_not_exists(icinga2/conf.d/templates.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 -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)
@@ -47,7 +46,6 @@
 -install_if_not_exists(icinga2/features-available/debuglog.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/conf.d/notifications.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
-+install_if_not_exists(icinga2/conf.d/satellite.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +install_if_not_exists(icinga2/conf.d/templates.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 +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)
@@ -63,5 +61,5 @@
 +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)
  install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d)
- install_if_not_exists(icinga2/repository.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/repository.d)
  
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/net-mgmt/icinga2/files/patch-itl_command-plugins.conf b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
index 8bd964a47a6a..0e96f99024a7 100644
--- a/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
+++ b/net-mgmt/icinga2/files/patch-itl_command-plugins.conf
@@ -1,6 +1,6 @@
---- itl/command-plugins.conf.orig	2017-08-02 13:58:38 UTC
-+++ itl/command-plugins.conf
-@@ -1630,6 +1630,10 @@ object CheckCommand "procs" {
+--- itl/command-plugins.conf.orig	2017-11-16 10:44:26.000000000 +0100
++++ itl/command-plugins.conf	2017-11-20 15:01:11.622955000 +0100
+@@ -1638,6 +1638,10 @@ object CheckCommand "procs" {
  			set_if = "$procs_nokthreads$"
  			description = "Only scan for non kernel threads"
  		}
diff --git a/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
index fb2675905aa6..2f8aa09a5ba8 100644
--- a/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/checker/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/checker/CMakeLists.txt
-@@ -37,7 +37,7 @@ set_target_properties (
+--- lib/checker/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/checker/CMakeLists.txt	2017-05-30 16:24:26.678934000 +0200
+@@ -38,7 +38,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
diff --git a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
index 690b9817f3b1..c5a82b7d4d8a 100644
--- a/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/compat/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/compat/CMakeLists.txt
-@@ -42,17 +42,17 @@ set_target_properties (
+--- lib/compat/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/compat/CMakeLists.txt	2017-05-30 16:24:26.681909000 +0200
+@@ -43,17 +43,17 @@ set_target_properties (
  )
  
  install_if_not_exists(
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
index f681eaf34e0d..64b925fa135e 100644
--- a/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/db_ido_mysql/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/db_ido_mysql/CMakeLists.txt
-@@ -41,7 +41,7 @@ if(MYSQL_FOUND)
+--- lib/db_ido_mysql/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/db_ido_mysql/CMakeLists.txt	2017-05-30 16:24:26.685470000 +0200
+@@ -42,7 +42,7 @@ if(MYSQL_FOUND)
    )
  
    install_if_not_exists(
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
index ad969709e850..1db5be85ef52 100644
--- a/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/db_ido_pgsql/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/db_ido_pgsql/CMakeLists.txt
-@@ -43,7 +43,7 @@ if(PostgreSQL_FOUND)
+--- lib/db_ido_pgsql/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/db_ido_pgsql/CMakeLists.txt	2017-05-30 16:24:26.688856000 +0200
+@@ -44,7 +44,7 @@ if(PostgreSQL_FOUND)
    )
  
    install_if_not_exists(
diff --git a/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
index 869c8787a5b0..f5e1c65889b8 100644
--- a/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/livestatus/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/livestatus/CMakeLists.txt
-@@ -47,7 +47,7 @@ set_target_properties (
+--- lib/livestatus/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/livestatus/CMakeLists.txt	2017-05-30 16:24:26.692057000 +0200
+@@ -48,7 +48,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
diff --git a/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
index 25ae50a59515..baebdf015337 100644
--- a/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/notification/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/notification/CMakeLists.txt
-@@ -37,7 +37,7 @@ set_target_properties (
+--- lib/notification/CMakeLists.txt.orig	2017-03-29 09:55:49.000000000 +0200
++++ lib/notification/CMakeLists.txt	2017-05-30 16:24:26.695167000 +0200
+@@ -38,7 +38,7 @@ set_target_properties (
  )
  
  install_if_not_exists(
diff --git a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
index 08ed0bdb5584..45cc1c3d398f 100644
--- a/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
+++ b/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt
@@ -1,6 +1,6 @@
---- lib/perfdata/CMakeLists.txt.orig	2016-08-17 14:19:24 UTC
-+++ lib/perfdata/CMakeLists.txt
-@@ -41,27 +41,27 @@ set_target_properties (
+--- lib/perfdata/CMakeLists.txt.orig	2017-11-16 10:44:26.000000000 +0100
++++ lib/perfdata/CMakeLists.txt	2017-11-20 15:02:18.563301000 +0100
+@@ -43,32 +43,32 @@ set_target_properties (
  )
  
  install_if_not_exists(
@@ -22,6 +22,12 @@
  )
  
  install_if_not_exists(
+-  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.conf
++  ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/elasticsearch.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
diff --git a/net-mgmt/icinga2/pkg-plist b/net-mgmt/icinga2/pkg-plist
index 3711b90a7d50..c5ac5ef37ef9 100644
--- a/net-mgmt/icinga2/pkg-plist
+++ b/net-mgmt/icinga2/pkg-plist
@@ -5,17 +5,16 @@ etc/bash_completion.d/icinga2
 @sample %%ETCDIR%%/conf.d/groups.conf.sample
 @sample %%ETCDIR%%/conf.d/hosts.conf.sample
 @sample %%ETCDIR%%/conf.d/notifications.conf.sample
-@sample %%ETCDIR%%/conf.d/satellite.conf.sample
 @sample %%ETCDIR%%/conf.d/services.conf.sample
 @sample %%ETCDIR%%/conf.d/templates.conf.sample
 @sample %%ETCDIR%%/conf.d/timeperiods.conf.sample
 @sample %%ETCDIR%%/conf.d/users.conf.sample
-@sample %%ETCDIR%%/constants.conf.sample
 @sample %%ETCDIR%%/features-available/api.conf.sample
 @sample %%ETCDIR%%/features-available/checker.conf.sample
 @sample %%ETCDIR%%/features-available/command.conf.sample
 @sample %%ETCDIR%%/features-available/compatlog.conf.sample
 @sample %%ETCDIR%%/features-available/debuglog.conf.sample
+@sample %%ETCDIR%%/features-available/elasticsearch.conf.sample
 @sample %%ETCDIR%%/features-available/gelf.conf.sample
 @sample %%ETCDIR%%/features-available/graphite.conf.sample
 %%MYSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample
@@ -31,47 +30,47 @@ etc/bash_completion.d/icinga2
 %%ETCDIR%%/features-enabled/checker.conf
 %%ETCDIR%%/features-enabled/mainlog.conf
 %%ETCDIR%%/features-enabled/notification.conf
+@sample %%ETCDIR%%/constants.conf.sample
 @sample %%ETCDIR%%/icinga2.conf.sample
 @sample %%ETCDIR%%/init.conf.sample
-%%ETCDIR%%/repository.d/README
 @sample %%ETCDIR%%/scripts/mail-host-notification.sh.sample
 @sample %%ETCDIR%%/scripts/mail-service-notification.sh.sample
 @sample %%ETCDIR%%/zones.conf.sample
 %%ETCDIR%%/zones.d/README
 lib/icinga2/libbase.so
-lib/icinga2/libbase.so.2.7.2
+lib/icinga2/libbase.so.2.8.0
 lib/icinga2/libchecker.so
-lib/icinga2/libchecker.so.2.7.2
+lib/icinga2/libchecker.so.2.8.0
 lib/icinga2/libcli.so
-lib/icinga2/libcli.so.2.7.2
+lib/icinga2/libcli.so.2.8.0
 lib/icinga2/libcompat.so
-lib/icinga2/libcompat.so.2.7.2
+lib/icinga2/libcompat.so.2.8.0
 lib/icinga2/libconfig.so
-lib/icinga2/libconfig.so.2.7.2
+lib/icinga2/libconfig.so.2.8.0
 %%DBBACKEND%%lib/icinga2/libdb_ido.so
-%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.7.2
+%%DBBACKEND%%lib/icinga2/libdb_ido.so.2.8.0
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
-%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.7.2
+%%MYSQL%%lib/icinga2/libdb_ido_mysql.so.2.8.0
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
-%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.7.2
+%%PGSQL%%lib/icinga2/libdb_ido_pgsql.so.2.8.0
 lib/icinga2/libexecvpe.so
-lib/icinga2/libexecvpe.so.2.7.2
+lib/icinga2/libexecvpe.so.2.8.0
 lib/icinga2/libicinga.so
-lib/icinga2/libicinga.so.2.7.2
+lib/icinga2/libicinga.so.2.8.0
 lib/icinga2/liblivestatus.so
-lib/icinga2/liblivestatus.so.2.7.2
+lib/icinga2/liblivestatus.so.2.8.0
 lib/icinga2/libmethods.so
-lib/icinga2/libmethods.so.2.7.2
+lib/icinga2/libmethods.so.2.8.0
 lib/icinga2/libmmatch.so
-lib/icinga2/libmmatch.so.2.7.2
+lib/icinga2/libmmatch.so.2.8.0
 lib/icinga2/libnotification.so
-lib/icinga2/libnotification.so.2.7.2
+lib/icinga2/libnotification.so.2.8.0
 lib/icinga2/libperfdata.so
-lib/icinga2/libperfdata.so.2.7.2
+lib/icinga2/libperfdata.so.2.8.0
 lib/icinga2/libremote.so
-lib/icinga2/libremote.so.2.7.2
+lib/icinga2/libremote.so.2.8.0
 lib/icinga2/libsocketpair.so
-lib/icinga2/libsocketpair.so.2.7.2
+lib/icinga2/libsocketpair.so.2.8.0
 lib/icinga2/sbin/icinga2
 libexec/nagios/check_nscp_api
 man/man8/icinga2.8.gz
@@ -100,13 +99,14 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/markdown/16-upgrading-icinga-2.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/17-language-reference.md
 %%PORTDOCS%%%%DOCSDIR%%/markdown/18-library-reference.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/19-script-debugger.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/20-development.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/21-selinux.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/22-migrating-from-icinga-1x.md
-%%PORTDOCS%%%%DOCSDIR%%/markdown/23-appendix.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/19-technical-concepts.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/20-script-debugger.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/21-development.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/22-selinux.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/23-migrating-from-icinga-1x.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/24-appendix.md
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/flapping-state-graph.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/advanced-topics/icinga2_external_checks_freshness_icingaweb2.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_bottom_up.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_endpoints.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_roles.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_ha_master_clients.png
@@ -137,7 +137,8 @@ sbin/icinga2
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png
-%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_no_ticket.png
+%%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_06_finish_with_ticket.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_examine_config.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/mariadb-centos7.png
 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/nano-syntax.png
@@ -154,6 +155,7 @@ sbin/icinga2
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.4.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.5.0.sql
 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.6.0.sql
+%%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.8.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
@@ -162,6 +164,7 @@ sbin/icinga2
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.4.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.5.0.sql
 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.6.0.sql
+%%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.8.0.sql
 %%DATADIR%%/include/command-icinga.conf
 %%DATADIR%%/include/command-nscp-local.conf
 %%DATADIR%%/include/command-plugins-manubulon.conf
@@ -191,12 +194,12 @@ sbin/icinga2
 %%DATADIR%%/include/windows-plugins
 share/vim/vimfiles/ftdetect/icinga2.vim
 share/vim/vimfiles/syntax/icinga2.vim
-@dir %%ETCDIR%%/pki
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log
-@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/repository
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api
+@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certificate-requests
+@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/certs
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2
 @dir /var/lib
 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat/archives