Index: head/net-mgmt/icinga2/Makefile =================================================================== --- head/net-mgmt/icinga2/Makefile (revision 512349) +++ head/net-mgmt/icinga2/Makefile (revision 512350) @@ -1,107 +1,105 @@ # $FreeBSD$ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.10.5 -PORTREVISION= 2 +DISTVERSION= 2.11.0 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org COMMENT= Monitoring and management system for hosts, services and networks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libyajl.so:devel/yajl +LIB_DEPENDS= libboost_system.so:devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= alias bison cmake:insource compiler:c++0x libedit ssl USE_GITHUB= yes GH_ACCOUNT= icinga USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS EXAMPLES 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: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.conf # 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.conf ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}.conf ${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 512349) +++ head/net-mgmt/icinga2/distinfo (revision 512350) @@ -1,3 +1,3 @@ -TIMESTAMP = 1558688104 -SHA256 (icinga-icinga2-v2.10.5_GH0.tar.gz) = c965c2b6fa697fbb5d87c928798a28f293050a8475b6a46d728dc3f222b1319a -SIZE (icinga-icinga2-v2.10.5_GH0.tar.gz) = 5141193 +TIMESTAMP = 1568881312 +SHA256 (icinga-icinga2-v2.11.0_GH0.tar.gz) = f1702a598aed458cce44668526db8d655a68f270e408f10b859eaac175ccdb51 +SIZE (icinga-icinga2-v2.11.0_GH0.tar.gz) = 7472579 Index: head/net-mgmt/icinga2/files/icinga2.in =================================================================== --- head/net-mgmt/icinga2/files/icinga2.in (revision 512349) +++ head/net-mgmt/icinga2/files/icinga2.in (revision 512350) @@ -1,127 +1,122 @@ #!/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.conf" by default. # icinga2_mkvar (bool): Set to "NO" by default. # Set it to "YES" to have the rc script create all # directories in /var (needed when /var is on a ramdisk) # . /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:%%PREFIX%%/sbin name="icinga2" desc="Icinga 2 monitoring (core)" rcvar=icinga2_enable load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} -: ${icinga2_mkvar:="NO"} : ${icinga2_user:="%%ICINGA2USER%%"} : ${icinga2_group:="%%ICINGA2GROUP%%"} : ${icinga2_webgroup:="www"} command="%%PREFIX%%/sbin/${name}" procname="/usr/local/lib/icinga2/sbin/icinga2" extra_commands="reload checkconfig configtest" 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() { - if checkyesno "icinga2_mkvar"; then - # Create necessary directories / change ownership - # While this is also done through pkg-plist, /var might be on a ramdisk, - # so make sure all needed files and directories are created before starting - # Icinga. - 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}" - fi - done + # Create necessary directories / change ownership + # While this is also done through pkg-plist, /var might be on a ramdisk, + # so make sure all needed files and directories are created before starting + # Icinga. + 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}" + fi + done - install -d -o ${icinga2_user} -g ${icinga2_webgroup} "${icinga2_rundir}/cmd" - - - fi + install -d -o ${icinga2_user} -g ${icinga2_webgroup} -m 2750 "${icinga2_rundir}/cmd" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_libdir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_spooldir}" chown -R ${icinga2_user}:${icinga2_group} "${icinga2_cachedir}" chown -R ${icinga2_user}:${icinga2_webgroup} "${icinga2_rundir}/cmd" 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/pkg-message.in =================================================================== --- head/net-mgmt/icinga2/files/pkg-message.in (revision 512349) +++ head/net-mgmt/icinga2/files/pkg-message.in (revision 512350) @@ -1,15 +1,18 @@ [ { type: install message: <