Index: head/net-mgmt/zabbix22-frontend/Makefile =================================================================== --- head/net-mgmt/zabbix22-frontend/Makefile (revision 438117) +++ head/net-mgmt/zabbix22-frontend/Makefile (revision 438118) @@ -1,52 +1,52 @@ # Created by: Jim Riggs # $FreeBSD$ PORTNAME= zabbix22 CATEGORIES= net-mgmt PKGNAMESUFFIX= -frontend MASTERDIR= ${.CURDIR}/../zabbix22-server NO_BUILD= yes NO_ARCH= yes PATCHDIR= PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ xmlreader xmlwriter simplexml gettext ldap -WANT_PHP_WEB= yes +USES+= php:web OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend MYSQL_VARS= IGNORE_WITH_PHP+=70 .include .if ${PORT_OPTIONS:MMYSQL} USE_PHP+= mysql .endif .if ${PORT_OPTIONS:MMYSQLI} USE_PHP+= mysqli .endif .if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql .endif .if ${PORT_OPTIONS:MSQLITE} USE_PHP+= sqlite3 .endif .if ${PORT_OPTIONS:MORACLE} ZABBIX_REQUIRE= CONFIGURE_ARGS+= --with-oracle .endif do-install: @${INSTALL} -d ${STAGEDIR}${WWWDIR} @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} .include "${MASTERDIR}/Makefile" Index: head/net-mgmt/zabbix22-server/Makefile =================================================================== --- head/net-mgmt/zabbix22-server/Makefile (revision 438117) +++ head/net-mgmt/zabbix22-server/Makefile (revision 438118) @@ -1,178 +1,178 @@ # Created by: Pakhom Golynga # $FreeBSD$ PORTNAME= zabbix22 -PORTVERSION= 2.2.15 +PORTVERSION= 2.2.17 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server DISTNAME= zabbix-${PORTVERSION} MAINTAINER= pg@pakhom.spb.ru COMMENT= Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//}) LICENSE= GPLv2 CONFLICTS= zabbix2${PKGNAMESUFFIX}-[0-9]* zabbix24${PKGNAMESUFFIX}[0-9]* zabbix3${PKGNAMESUFFIX}-[0-9]* LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//} .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings .if ${ZABBIX_BUILD} != "agent" USE_RC_SUBR= zabbix_${ZABBIX_BUILD} .else USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d .endif USES= pkgconfig iconv USERS= zabbix GROUPS= zabbix .if ${ZABBIX_BUILD} != "proxy" PLIST_SUB= PROXY="@comment " .else PLIST_SUB= PROXY="" .endif .if ${ZABBIX_BUILD} == "server" PLIST_SUB+= SERVER="" .else PLIST_SUB+= SERVER="@comment " .endif PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} MAKE_ARGS+= ARCH=freebsd GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \ --sysconfdir=${ETCDIR} \ --datadir=${ETCDIR} \ --with-iconv=${ICONV_PREFIX} .if ${ZABBIX_BUILD} != "agent" USES+= execinfo CPPFLAGS+= ${EXECINFO_CPPFLAGS} LDFLAGS+= ${EXECINFO_LDFLAGS} SUB_FILES= pkg-message CONFIGURE_ARGS+= --with-net-snmp OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW LIBXML2 OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL UNIXODBC OPTIONS_SUB= yes CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks IPMI_DESC= Support for IPMI checks JABBER_DESC= Support for Jabber media type LDAP_DESC= Support for LDAP server checks NMAP_DESC= Build/install Nmap for OS detection SSH_DESC= Support for SSH-based checks ODBC_DESC= Support for database checks via ODBC JAVAGW_DESC= Support for Java gateway LIBXML2_DESC= Support for libxml2 (required by monitoring VMware) OPTIONS_SINGLE= DB ODBC OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC MYSQL_CONFIGURE_WITH= mysql MYSQL_USES+= mysql PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES+= pgsql SQLITE_CONFIGURE_WITH= sqlite3 SQLITE_USES+= sqlite:3 ORACLE_CONFIGURE_WITH= oracle CURL_CONFIGURE_WITH= libcurl CURL_LIB_DEPENDS= libcurl.so:ftp/curl LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes IPMI_CONFIGURE_WITH= openipmi IPMI_LIB_DEPENDS= libOpenIPMI.so:sysutils/openipmi JABBER_CONFIGURE_WITH= jabber JABBER_LIB_DEPENDS= libiksemel.so:textproc/iksemel FPING_RUN_DEPENDS= fping:net/fping SSH_CONFIGURE_WITH= ssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 IODBC_CONFIGURE_WITH= iodbc IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc UNIXODBC_CONFIGURE_WITH= unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC .endif # if ${ZABBIX_BUILD} != "agent" IPV6_CONFIGURE_ENABLE= ipv6 NMAP_RUN_DEPENDS= nmap:security/nmap \ sudo:security/sudo JAVAGW_CONFIGURE_ENABLE= java JAVAGW_USE= JAVA=yes LIBXML2_CONFIGURE_WITH= libxml2 LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 .include post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' @${REINPLACE_CMD} -e 's#/usr/sbin/fping#${LOCALBASE}/sbin/fping#g' ${WRKSRC}/conf/zabbix_*.conf .if ${ZABBIX_BUILD} != "agent" .if ! ${PORT_OPTIONS:MFPING} .endif .for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \ s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \ s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \ ${WRKSRC}/database/${d}/data.sql .endfor .endif @${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ ${WRKSRC}/src/zabbix_${ZABBIX_BUILD}/Makefile.in @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} {} + .if ${ZABBIX_BUILD} == "server" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_server.pid#PidFile=/var/run/zabbix/zabbix_server.pid#g' \ ${WRKSRC}/conf/zabbix_server*.conf .endif .if ${ZABBIX_BUILD} == "proxy" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_proxy.pid#PidFile=/var/run/zabbix/zabbix_proxy.pid#g' \ ${WRKSRC}/conf/zabbix_proxy*.conf .endif .if ${ZABBIX_BUILD} == "agent" @${REINPLACE_CMD} -e 's#PidFile=/tmp/zabbix_agentd.pid#PidFile=/var/run/zabbix/zabbix_agentd.pid#g' \ ${WRKSRC}/conf/zabbix_agentd.conf .endif .if ${ZABBIX_BUILD} != "agent" ${MKDIR} "${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database" cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/upgrades/ cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database/ .endif .endif post-install: .if ${PORT_OPTIONS:MJAVAGW} @${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample .endif .include Index: head/net-mgmt/zabbix22-server/distinfo =================================================================== --- head/net-mgmt/zabbix22-server/distinfo (revision 438117) +++ head/net-mgmt/zabbix22-server/distinfo (revision 438118) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475755867 -SHA256 (zabbix-2.2.15.tar.gz) = 1dc370a04bc42bf21cdedc2dd53de051ac4a61d20ae83cd7c6e1cdd9c574f653 -SIZE (zabbix-2.2.15.tar.gz) = 15487398 +TIMESTAMP = 1489335489 +SHA256 (zabbix-2.2.17.tar.gz) = cf42c5db31c27466a9ec33b6bf22289bbc43ee4e5711e6d323d71644b743e535 +SIZE (zabbix-2.2.17.tar.gz) = 15494053 Index: head/net-mgmt/zabbix22-server/files/zabbix_agentd.in =================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_agentd.in (revision 438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_agentd.in (revision 438118) @@ -1,55 +1,64 @@ #!/bin/sh # PROVIDE: zabbix_agentd # REQUIRE: DAEMON # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to # enable zabbix_agentd: # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. # zabbix_agentd_config (string): Set to the standard config file path by # default. -# zabbix_agentd_pidfile (string): Location of the zabbix_agentd pid file +# zabbix_agentd_pidfile (string): Location of the zabbix_agent pid file # Default is /var/run/zabbix/zabbix_agentd.pid +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr name="zabbix_agentd" rcvar=zabbix_agentd_enable load_rc_config $name : ${zabbix_agentd_enable:=NO} : ${zabbix_agentd_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_agentd_pidfile:=/var/run/zabbix/zabbix_agentd.pid} +: ${zabbix_agentd_paths:=$PATH} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_agentd_config}" +start_cmd=zabbix_agentd_cmd start_precmd=zabbix_agentd_precmd status_precmd=zabbix_agentd_precmd stop_precmd=zabbix_agentd_precmd zabbix_agentd_precmd() { if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then pidfile="$_pidfile_from_conf" else pidfile=${zabbix_agentd_pidfile} local rundir=${zabbix_agentd_pidfile%/*} if [ ! -d $rundir ] ; then install -d -m 0755 -o zabbix -g zabbix $rundir fi fi # This shouldn't be necessary with pidfile, but empirically it was the # only way to reap the parent PID instead of all PIDs from # check_process, which may leak SysV IPC objects and prevent restart # and/or race condition on restart. rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +zabbix_agentd_cmd() +{ + PATH=$zabbix_agentd_paths $command -c $zabbix_agentd_config } run_rc_command "$1" Index: head/net-mgmt/zabbix22-server/files/zabbix_proxy.in =================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_proxy.in (revision 438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_proxy.in (revision 438118) @@ -1,57 +1,65 @@ #!/bin/sh # PROVIDE: zabbix_proxy # REQUIRE: DAEMON %%PGSQL%%# REQUIRE: postgresql %%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to # enable zabbix_proxy: # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. # zabbix_proxy_config (string): Set to the standard config file path by # default. # zabbix_proxy_pidfile (string): Location of the zabbix_proxy pid file # Default is /var/run/zabbix/zabbix_proxy.pid +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr name="zabbix_proxy" rcvar=zabbix_proxy_enable load_rc_config $name : ${zabbix_proxy_enable:=NO} : ${zabbix_proxy_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_proxy_pidfile:=/var/run/zabbix/zabbix_proxy.pid} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_proxy_config}" +start_cmd=zabbix_proxy_cmd start_precmd=zabbix_proxy_precmd status_precmd=zabbix_proxy_precmd stop_precmd=zabbix_proxy_precmd zabbix_proxy_precmd() { if get_pidfile_from_conf PidFile ${zabbix_proxy_config}; then pidfile="$_pidfile_from_conf" else pidfile=${zabbix_proxy_pidfile} local rundir=${zabbix_proxy_pidfile%/*} if [ ! -d $rundir ] ; then install -d -m 0755 -o zabbix -g zabbix $rundir fi fi # This shouldn't be necessary with pidfile, but empirically it was the # only way to reap the parent PID instead of all PIDs from # check_process, which may leak SysV IPC objects and prevent restart # and/or race condition on restart. rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +zabbix_proxy_cmd() +{ + PATH=$zabbix_proxy_paths $command -c $zabbix_proxy_config } run_rc_command "$1" Index: head/net-mgmt/zabbix22-server/files/zabbix_server.in =================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_server.in (revision 438117) +++ head/net-mgmt/zabbix22-server/files/zabbix_server.in (revision 438118) @@ -1,57 +1,66 @@ #!/bin/sh # PROVIDE: zabbix_server # REQUIRE: DAEMON %%PGSQL%%# REQUIRE: postgresql %%MYSQL%%# REQUIRE: mysql-server # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to # enable zabbix_server: # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. # zabbix_server_config (string): Set to the standard config file path by # default. # zabbix_server_pidfile (string): Location of the zabbix_server pid file # Default is /var/run/zabbix/zabbix_server.pid +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. # . /etc/rc.subr name="zabbix_server" rcvar=zabbix_server_enable load_rc_config $name : ${zabbix_server_enable:=NO} : ${zabbix_server_config:=%%ETCDIR%%/${name}.conf} : ${zabbix_server_pidfile:=/var/run/zabbix/zabbix_server.pid} +: ${zabbix_server_paths:=$PATH} command="%%PREFIX%%/sbin/${name}" required_files="${zabbix_server_config}" +start_cmd=zabbix_server_cmd start_precmd=zabbix_server_precmd status_precmd=zabbix_server_precmd stop_precmd=zabbix_server_precmd zabbix_server_precmd() { if get_pidfile_from_conf PidFile ${zabbix_server_config}; then pidfile="$_pidfile_from_conf" else pidfile=${zabbix_server_pidfile} local rundir=${zabbix_server_pidfile%/*} if [ ! -d $rundir ] ; then install -d -m 0755 -o zabbix -g zabbix $rundir fi fi # This shouldn't be necessary with pidfile, but empirically it was the # only way to reap the parent PID instead of all PIDs from # check_process, which may leak SysV IPC objects and prevent restart # and/or race condition on restart. rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +zabbix_server_cmd() +{ + PATH=$zabbix_server_paths $command -c $zabbix_server_config } run_rc_command "$1"