Index: head/net-mgmt/icinga2/Makefile =================================================================== --- head/net-mgmt/icinga2/Makefile (revision 392045) +++ head/net-mgmt/icinga2/Makefile (revision 392046) @@ -1,87 +1,93 @@ # $FreeBSD$ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.3.4 +DISTVERSION= 2.3.6 CATEGORIES= net-mgmt 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 USE_GITHUB= yes GH_ACCOUNT= icinga USES= alias bison cmake USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MYSQL PGSQL +OPTIONS_GROUP= BACKEND +OPTIONS_GROUP_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 \ + -DICINGA2_RUNDIR=/var/run \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} \ ICINGA2USER=${ICINGA2USER} \ ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} +PLIST_SUB= 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}/itl -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 392045) +++ head/net-mgmt/icinga2/distinfo (revision 392046) @@ -1,2 +1,2 @@ -SHA256 (icinga-icinga2-v2.3.4_GH0.tar.gz) = 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa -SIZE (icinga-icinga2-v2.3.4_GH0.tar.gz) = 782506 +SHA256 (icinga-icinga2-v2.3.6_GH0.tar.gz) = 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 +SIZE (icinga-icinga2-v2.3.6_GH0.tar.gz) = 816718 Index: head/net-mgmt/icinga2/files/icinga2.in =================================================================== --- head/net-mgmt/icinga2/files/icinga2.in (revision 392045) +++ head/net-mgmt/icinga2/files/icinga2.in (revision 392046) @@ -1,107 +1,111 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: icinga2 # REQUIRE: LOGIN # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable icinga2: # icinga2_enable (bool): Set to "NO" by default. # Set it to "YES" to enable icinga2. # icinga2_flags (str): Set to "" by default. # icinga2_configfile (str): Set to "%%PREFIX%%/etc/icinga2/icinga2.cfg" by default. # . /etc/rc.subr # Add /usr/local/bin to path, so that the notification scripts # can work (#!/usr/bin/env bash) export PATH=$PATH:%%LOCALBASE%%/bin name="icinga2" rcvar=icinga2_enable load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} command="%%PREFIX%%/sbin/${name}" extra_commands="reload checkconfig configtest" icinga2_user="%%ICINGA2USER%%" icinga2_group="%%ICINGA2GROUP%%" icinga2_cachedir="/var/cache/${name}" icinga2_libdir="/var/lib/${name}" icinga2_logdir="%%ICINGA2LOGDIR%%" icinga2_rundir="/var/run/${name}" icinga2_spooldir="/var/spool/${name}" pidfile="${icinga2_rundir}/${name}.pid" icinga2_logfile="${icinga2_logdir}/${name}.log" icinga2_errorlogfile="${icinga2_logdir}/error.log" start_cmd="start_cmd" start_precmd="start_precmd" restart_precmd="icinga2_checkconfig" reload_precmd="reload_precmd" checkconfig_cmd="icinga2_checkconfig verbose" configtest_cmd="${checkconfig_cmd}" sig_reload=HUP required_files="${icinga2_configfile}" command_args="daemon -d -e ${icinga2_errorlogfile} -c ${icinga2_configfile}" icinga2_checkconfig() { echo -n "Performing sanity check of icinga2 configuration: " if [ "$1" != "verbose" ]; then quietredir="2>&1 >/dev/null" fi ${command} daemon -c ${icinga2_configfile} -C if [ $? -ne 0 ]; then echo "FAILED" return 1 else echo "OK" fi } reload_precmd() { if ! icinga2_checkconfig; then return 1 fi } start_precmd() { - # Create necessary directories / change ownership - for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ - "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ - "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ - "${icinga2_rundir}" "${icinga2_cachedir}"; do - install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" - done - - install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" - - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" +# # Create necessary directories / change ownership +# for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ +# "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ +# "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ +# "${icinga2_rundir}" "${icinga2_cachedir}"; do +# if [ ! -d "${d}" ]; then +# install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" +# else +# chown ${icinga2_user}:${icinga2_group} "${d}" +# fi +# done +# +# install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" +# +# chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" +# chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" if ! icinga2_checkconfig; then return 1 fi if [ ! -f "${icinga2_logfile}" ]; then install -o "${icinga2_user}" -g "${icinga2_group}" -m 644 /dev/null "${icinga2_logfile}" fi } start_cmd() { ${command} ${command_args} } run_rc_command "$1" Index: head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 392045) +++ head/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt (revision 392046) @@ -1,64 +1,67 @@ ---- 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" +--- etc/CMakeLists.txt.orig 2015-07-08 10:17:44.000000000 +0200 ++++ etc/CMakeLists.txt 2015-07-13 22:06:31.230363000 +0200 +@@ -26,43 +26,43 @@ 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(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(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + 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/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/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/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/debuglog.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/mainlog.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/debuglog.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/mainlog.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) + 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) Index: head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt (revision 392046) @@ -0,0 +1,10 @@ +--- itl/CMakeLists.txt.orig 2015-07-13 22:14:51.872881000 +0200 ++++ itl/CMakeLists.txt 2015-07-13 22:15:19.702183000 +0200 +@@ -18,6 +18,6 @@ + add_subdirectory(plugins-contrib.d) + + install( +- FILES itl command.conf command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf windows-plugins command-plugins-windows.conf nscp command-nscp-local.conf plugins-contrib ++ FILES itl command.conf.sample command-icinga.conf.sample hangman timeperiod.conf.sample plugins command-plugins.conf.sample manubulon command-plugins-manubulon.conf.sample windows-plugins command-plugins-windows.conf.sample nscp command-nscp-local.conf.sample plugins-contrib + DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include + ) Property changes on: head/net-mgmt/icinga2/files/patch-itl_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-itl_plugins-contrib.d_CMakeLists.txt =================================================================== --- head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt (nonexistent) +++ head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt (revision 392046) @@ -0,0 +1,10 @@ +--- itl/plugins-contrib.d/CMakeLists.txt.orig 2015-07-13 22:15:59.084514000 +0200 ++++ itl/plugins-contrib.d/CMakeLists.txt 2015-07-13 22:16:44.501021000 +0200 +@@ -16,6 +16,6 @@ + # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + install( +- FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf ++ FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample + DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include/plugins-contrib.d + ) Property changes on: head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_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 392045) +++ head/net-mgmt/icinga2/pkg-plist (revision 392046) @@ -1,132 +1,134 @@ 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 -%%MYSQL%%@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample -%%PGSQL%%@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-pgsql.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/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%%%%PGSQL%%llib/icinga2/libdb_ido.so %%MYSQL%%lib/icinga2/libdb_ido_mysql.so %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so lib/icinga2/libexecvpe.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/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/4-configuring-icinga-2.md +%%PORTDOCS%%%%DOCSDIR%%/markdown/5-advanced-topics.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 %%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 %%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 -%%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 +@sample %%DATADIR%%/include/command-icinga.conf.sample +@sample %%DATADIR%%/include/command-nscp-local.conf.sample +@sample %%DATADIR%%/include/command-plugins-manubulon.conf.sample +@sample %%DATADIR%%/include/command-plugins.conf.sample +@sample %%DATADIR%%/include/command.conf.sample %%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/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/plugins-contrib.d/web.conf -%%DATADIR%%/include/timeperiod.conf +@sample %%DATADIR%%/include/plugins-contrib.d/databases.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/ipmi.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/network-components.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/operating-system.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/virtualization.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/vmware.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/web.conf.sample +@sample %%DATADIR%%/include/timeperiod.conf.sample +@sample %%DATADIR%%/include/command-plugins-windows.conf.sample +%%DATADIR%%/include/windows-plugins @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(%%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 @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 +@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