Index: head/net-mgmt/icinga2/Makefile =================================================================== --- head/net-mgmt/icinga2/Makefile (revision 454756) +++ head/net-mgmt/icinga2/Makefile (revision 454757) @@ -1,109 +1,109 @@ # $FreeBSD$ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.7.2 +DISTVERSION= 2.8.0 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_powerpc64= does not build: Your version of GCC (4.2.1) is too old for building Icinga 2 (GCC >= 4.6.0) 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 USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS OPTIONS_GROUP= BACKEND 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 MYSQL_CMAKE_ON= -DICINGA2_WITH_MYSQL:BOOL=true PGSQL_CMAKE_ON= -DICINGA2_WITH_PGSQL:BOOL=true ICINGA2USER?= icinga ICINGA2GROUP?= icinga USERS= ${ICINGA2USER} GROUPS= ${ICINGA2GROUP} LOCALSTATEDIR?= /var ICINGA2LOGDIR?= /var/log/${PORTNAME} CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2USER} \ -DICINGA2_GROUP=${ICINGA2GROUP} \ -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ -DICINGA2_RUNDIR=/var/run \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ -DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \ -DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2 SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} PLIST_SUB= ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} SUB_FILES= pkg-message ${PORTNAME}-newsyslog # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf MYSQL_USES= mysql PGSQL_USES= pgsql OPTIONS_SUB= yes .include .if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} PLIST_SUB+= DBBACKEND="@comment " .else PLIST_SUB+= DBBACKEND="" .endif post-patch: .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles (cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/share/vim/vimfiles) .include Index: head/net-mgmt/icinga2/distinfo =================================================================== --- head/net-mgmt/icinga2/distinfo (revision 454756) +++ head/net-mgmt/icinga2/distinfo (revision 454757) @@ -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 Index: head/net-mgmt/icinga2/files/patch-CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-CMakeLists.txt (revision 454757) @@ -1,13 +1,13 @@ ---- 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() -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) Index: head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 454757) @@ -1,67 +1,65 @@ ---- 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() -install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) +install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) if(NOT WIN32) - install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) - install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + install_if_not_exists(icinga2/icinga2.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(icinga2/win32/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) endif() -install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) -install_if_not_exists(icinga2/conf.d/app.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/commands.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/downtimes.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/groups.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/zones.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) +install_if_not_exists(icinga2/conf.d/app.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/commands.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/downtimes.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/groups.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) if(NOT WIN32) - install_if_not_exists(icinga2/conf.d/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) - install_if_not_exists(icinga2/conf.d/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) + install_if_not_exists(icinga2/conf.d/hosts.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) + install_if_not_exists(icinga2/conf.d/services.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) else() install_if_not_exists(icinga2/conf.d/win32/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) install_if_not_exists(icinga2/conf.d/win32/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) 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) -install_if_not_exists(icinga2/features-available/api.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/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) +install_if_not_exists(icinga2/features-available/api.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/mainlog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) if(NOT WIN32) - install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) + install_if_not_exists(icinga2/features-available/syslog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) endif() -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) +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") Index: head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf =================================================================== --- head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf (revision 454756) +++ head/net-mgmt/icinga2/files/patch-itl_command-plugins.conf (revision 454757) @@ -1,13 +1,13 @@ ---- 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" } + "-j" = { + value = "$procs_jid$" + description = "Only scan for processes within that jail ID" + } } vars.procs_traditional = false Index: head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt (revision 454757) @@ -1,11 +1,11 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt (revision 454757) @@ -1,23 +1,23 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_db__ido__mysql_CMakeLists.txt (revision 454757) @@ -1,11 +1,11 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_db__ido__pgsql_CMakeLists.txt (revision 454757) @@ -1,11 +1,11 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt (revision 454757) @@ -1,11 +1,11 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt (revision 454757) @@ -1,11 +1,11 @@ ---- 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( - ${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 ) Index: head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt (revision 454756) +++ head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt (revision 454757) @@ -1,35 +1,41 @@ ---- 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( - ${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/influxdb.conf + ${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/influxdb.conf.sample + ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available + ) + + 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 ) 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 ) Index: head/net-mgmt/icinga2/pkg-plist =================================================================== --- head/net-mgmt/icinga2/pkg-plist (revision 454756) +++ head/net-mgmt/icinga2/pkg-plist (revision 454757) @@ -1,210 +1,213 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/conf.d/app.conf.sample @sample %%ETCDIR%%/conf.d/commands.conf.sample @sample %%ETCDIR%%/conf.d/downtimes.conf.sample @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 %%PGSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample @sample %%ETCDIR%%/features-available/influxdb.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 %%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 sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/markdown/01-about.md %%PORTDOCS%%%%DOCSDIR%%/markdown/02-getting-started.md %%PORTDOCS%%%%DOCSDIR%%/markdown/03-monitoring-basics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/04-configuring-icinga-2.md %%PORTDOCS%%%%DOCSDIR%%/markdown/05-service-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/06-distributed-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/07-agent-based-monitoring.md %%PORTDOCS%%%%DOCSDIR%%/markdown/08-advanced-topics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/09-object-types.md %%PORTDOCS%%%%DOCSDIR%%/markdown/10-icinga-template-library.md %%PORTDOCS%%%%DOCSDIR%%/markdown/11-cli-commands.md %%PORTDOCS%%%%DOCSDIR%%/markdown/12-icinga2-api.md %%PORTDOCS%%%%DOCSDIR%%/markdown/13-addons.md %%PORTDOCS%%%%DOCSDIR%%/markdown/14-features.md %%PORTDOCS%%%%DOCSDIR%%/markdown/15-troubleshooting.md %%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 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_clients.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_scenarios_master_satellite_client.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_command_endpoint.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_top_down_config_sync.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_client_disk_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_api_drivesize_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_windows_nscp_counter_icingaweb2.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_distributed_zones.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_cmd_admin_net_start_stop.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_running_service.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_installer_05.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_04.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png %%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 %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/postgr-import-ido.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/getting-started/vim-syntax.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icinga2-api/icinga2_api_icinga_studio_connect.png %%PORTDOCS%%%%DOCSDIR%%/markdown/images/icinga2-api/icinga2_api_icinga_studio_overview.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsyslog/icinga2 %%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 %%MYSQL%%%%DATADIR%%-ido-mysql/schema/upgrade/2.3.0.sql %%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 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql %%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 %%DATADIR%%/include/command-plugins-windows.conf %%DATADIR%%/include/command-plugins.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/databases.conf %%DATADIR%%/include/plugins-contrib.d/hardware.conf %%DATADIR%%/include/plugins-contrib.d/icingacli.conf %%DATADIR%%/include/plugins-contrib.d/ipmi.conf %%DATADIR%%/include/plugins-contrib.d/logmanagement.conf %%DATADIR%%/include/plugins-contrib.d/metrics.conf %%DATADIR%%/include/plugins-contrib.d/network-components.conf %%DATADIR%%/include/plugins-contrib.d/network-services.conf %%DATADIR%%/include/plugins-contrib.d/operating-system.conf %%DATADIR%%/include/plugins-contrib.d/raid-controller.conf %%DATADIR%%/include/plugins-contrib.d/smart-attributes.conf %%DATADIR%%/include/plugins-contrib.d/storage.conf %%DATADIR%%/include/plugins-contrib.d/virtualization.conf %%DATADIR%%/include/plugins-contrib.d/vmware.conf %%DATADIR%%/include/plugins-contrib.d/web.conf %%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 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/crash @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2 @dir(%%ICINGA2USER%%,%%WWWGRP%%,2750) /var/run/icinga2/cmd @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/run/icinga2 @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2