Index: head/net-mgmt/icinga2/Makefile =================================================================== --- head/net-mgmt/icinga2/Makefile (revision 382344) +++ head/net-mgmt/icinga2/Makefile (revision 382345) @@ -1,84 +1,84 @@ # $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=/ MAINTAINER= lme@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks LICENSE= GPLv2 LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libyajl.so:${PORTSDIR}/devel/yajl \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash USES= alias bison cmake USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS OPTIONS_DEFAULT= MYSQL PGSQL MONPLUGINS MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/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 \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf MYSQL_USE= mysql=yes PGSQL_USES= pgsql OPTIONS_SUB= yes .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=2.5.31:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex CXXFLAGS+= -I${LOCALBASE}/include/flex .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 \; .include Index: head/net-mgmt/icinga2/distinfo =================================================================== --- head/net-mgmt/icinga2/distinfo (revision 382344) +++ head/net-mgmt/icinga2/distinfo (revision 382345) @@ -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 Index: head/net-mgmt/icinga2/files/patch-CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-CMakeLists.txt (revision 382344) +++ head/net-mgmt/icinga2/files/patch-CMakeLists.txt (revision 382345) @@ -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) Index: head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 382344) +++ head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 382345) @@ -1,85 +1,64 @@ ---- 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() -install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.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/init.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) +install_if_not_exists(icinga2/icinga2.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(${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) -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/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/hosts.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) 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/services.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/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) +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/services.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/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) 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) Index: head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_checker_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_compat_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_db_ido_mysql_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_db_ido_mysql_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_db_ido_pgsql_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_db_ido_pgsql_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_livestatus_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_notification_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt (revision 382345) @@ -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 + ) + Property changes on: head/net-mgmt/icinga2/files/patch-lib_perfdata_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/icinga2/pkg-plist =================================================================== --- head/net-mgmt/icinga2/pkg-plist (revision 382344) +++ head/net-mgmt/icinga2/pkg-plist (revision 382345) @@ -1,105 +1,125 @@ etc/bash_completion.d/icinga2 @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/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 %%ETCDIR%%/features-enabled/checker.conf %%ETCDIR%%/features-enabled/mainlog.conf %%ETCDIR%%/features-enabled/notification.conf @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/libchecker.so lib/icinga2/libcli.so lib/icinga2/libcompat.so 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 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 %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%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 @dir /var/lib/icinga2/api/log @dir /var/lib/icinga2/api/repository @dir /var/lib/icinga2/api/zones @dir /var/lib/icinga2/api @dir /var/lib/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 @dir /var/spool/icinga2/perfdata @dir /var/spool/icinga2/tmp @dir /var/spool/icinga2