Attachment #195367 for bug #217777

View | Details | Raw Unified | Return to bug 217777
Collapse All | Expand All

Lines 407-412 Link Here

(-)net-mgmt/Makefile (+1 lines)
407	SUBDIR += zabbix22-server	407	SUBDIR += zabbix22-server
408	SUBDIR += zabbix3-agent	408	SUBDIR += zabbix3-agent
409	SUBDIR += zabbix3-frontend	409	SUBDIR += zabbix3-frontend
		410	SUBDIR += zabbix3-java
410	SUBDIR += zabbix3-proxy	411	SUBDIR += zabbix3-proxy
411	SUBDIR += zabbix3-server	412	SUBDIR += zabbix3-server
412	SUBDIR += zabbix32-agent	413	SUBDIR += zabbix32-agent




# $FreeBSD$

PORTNAME=	zabbix3
CATEGORIES=	net-mgmt
PKGNAMESUFFIX=	-java

MASTERDIR=	${.CURDIR}/../zabbix3-server
PLIST=		${PKGDIR}/pkg-plist.java

OPTIONS_DEFINE=		IPV6

USE_JAVA=	yes

.include "${MASTERDIR}/Makefile"




			--datadir=${ETCDIR} \
			--with-iconv=${ICONV_PREFIX}

.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp

CPPFLAGS+=	-I${LOCALBASE}/include


CONFIGURE_ARGS+=	--with-net-snmp

OPTIONS_DEFINE=		IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
			LIBXML2

OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
OPTIONS_SUB=		yes

NMAP_DESC=		Build/install nmap for o/s 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 SSL


UNIXODBC_CONFIGURE_WITH=unixodbc
UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
.elif ${ZABBIX_BUILD} == "agent"
OPTIONS_SINGLE=	SSL
OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"

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


		${WRKSRC}/conf/zabbix_agentd*.conf
.endif

.if ${ZABBIX_BUILD} == "java"
	@${REINPLACE_CMD} -e 's#PID_FILE="/tmp/zabbix_java.pid"#PID_FILE="/var/run/zabbix/zabbix_java.pid"#g' \
		${WRKSRC}/src/zabbix_java/settings.sh
.endif

.if ${ZABBIX_BUILD} != "agent"
.  for d in mysql oracle postgresql sqlite3
	@${REINPLACE_CMD} \


post-install:

.if ${ZABBIX_BUILD} == "java"
	${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \
		${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
.endif

.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
	(cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \
		${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/)




#!/bin/sh

# PROVIDE: zabbix_java
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown
#
# Options to configure zabbix_java via /etc/rc.conf:
#
# zabbix_java_enable (bool):
#   Enable service on boot.
#   Default: NO
#

. /etc/rc.subr

name="zabbix_java"
rcvar=zabbix_java_enable

load_rc_config $name

: ${zabbix_java_enable:=NO}

start_cmd="%%PREFIX%%/sbin/zabbix_java/startup.sh"
stop_cmd="%%PREFIX%%/sbin/zabbix_java/shutdown.sh"
start_precmd=zabbix_java_precmd 

zabbix_java_precmd() {
	if [ ! -d /var/run/zabbix ] ; then
		install -d -m 0755 -o zabbix -g zabbix /var/run/zabbix
	fi
}

run_rc_command "$1"




%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
%%JAVAGW%%sbin/zabbix_java/shutdown.sh
%%JAVAGW%%sbin/zabbix_java/lib/logback-console.xml
%%JAVAGW%%sbin/zabbix_java/lib/logback-core-0.9.27.jar
%%JAVAGW%%sbin/zabbix_java/lib/logback-classic-0.9.27.jar
%%JAVAGW%%sbin/zabbix_java/lib/logback.xml
%%JAVAGW%%sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
%%JAVAGW%%sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
%%JAVAGW%%sbin/zabbix_java/settings.sh.sample
%%JAVAGW%%sbin/zabbix_java/startup.sh
%%JAVAGW%%sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
%%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts
@dir %%ETCDIR%%/zabbix/externalscripts
%%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d

Line 0 Link Here

(-)net-mgmt/zabbix3-server/pkg-plist.java (+10 lines)
	1	sbin/zabbix_java/shutdown.sh
	2	sbin/zabbix_java/lib/logback-console.xml
	3	sbin/zabbix_java/lib/logback-core-0.9.27.jar
	4	sbin/zabbix_java/lib/logback-classic-0.9.27.jar
	5	sbin/zabbix_java/lib/logback.xml
	6	sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
	7	sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
	8	@sample sbin/zabbix_java/settings.sh.sample
	9	sbin/zabbix_java/startup.sh
	10	sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar

Return to bug 217777

Lines 53-59 Link Here

(-)net-mgmt/zabbix3-server/Makefile (-11 / +11 lines)
53	--datadir=${ETCDIR} \	53	--datadir=${ETCDIR} \
54	--with-iconv=${ICONV_PREFIX}	54	--with-iconv=${ICONV_PREFIX}
55		55
56	.if ${ZABBIX_BUILD} != "agent"	56	.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
57	LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp	57	LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
58		58
59	CPPFLAGS+= -I${LOCALBASE}/include	59	CPPFLAGS+= -I${LOCALBASE}/include
Lines 62-69 Link Here
62		62
63	CONFIGURE_ARGS+= --with-net-snmp	63	CONFIGURE_ARGS+= --with-net-snmp
64		64
65	OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP JAVAGW \	65	OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP LIBXML2
66	LIBXML2
67		66
68	OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL	67	OPTIONS_DEFAULT= FPING CURL UNIXODBC MYSQL OPENSSL
69	OPTIONS_SUB= yes	68	OPTIONS_SUB= yes
Lines 76-82 Link Here
76	NMAP_DESC= Build/install nmap for o/s detection	75	NMAP_DESC= Build/install nmap for o/s detection
77	SSH_DESC= Support for SSH-based checks	76	SSH_DESC= Support for SSH-based checks
78	ODBC_DESC= Support for database checks via ODBC	77	ODBC_DESC= Support for database checks via ODBC
79	JAVAGW_DESC= Support for Java gateway
80	LIBXML2_DESC= Support for libxml2 (required by monitoring VMware)	78	LIBXML2_DESC= Support for libxml2 (required by monitoring VMware)
81		79
82	OPTIONS_SINGLE= DB ODBC SSL	80	OPTIONS_SINGLE= DB ODBC SSL
Lines 117-135 Link Here
117		115
118	UNIXODBC_CONFIGURE_WITH=unixodbc	116	UNIXODBC_CONFIGURE_WITH=unixodbc
119	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC	117	UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
120	.else	118	.elif ${ZABBIX_BUILD} == "agent"
121	OPTIONS_SINGLE= SSL	119	OPTIONS_SINGLE= SSL
122	OPTIONS_SINGLE_SSL= OPENSSL GNUTLS	120	OPTIONS_SINGLE_SSL= OPENSSL GNUTLS
123	.endif # if ${ZABBIX_BUILD} != "agent"	121	.endif # if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
124		122
125	IPV6_CONFIGURE_ENABLE= ipv6	123	IPV6_CONFIGURE_ENABLE= ipv6
126		124
127	NMAP_RUN_DEPENDS= nmap:security/nmap \	125	NMAP_RUN_DEPENDS= nmap:security/nmap \
128	sudo:security/sudo	126	sudo:security/sudo
129		127
130	JAVAGW_CONFIGURE_ENABLE=java
131	JAVAGW_USE= JAVA=yes
132
133	LIBXML2_CONFIGURE_WITH= libxml2	128	LIBXML2_CONFIGURE_WITH= libxml2
134	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2	129	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
135		130
Lines 172-177 Link Here
172	${WRKSRC}/conf/zabbix_agentd*.conf	167	${WRKSRC}/conf/zabbix_agentd*.conf
173	.endif	168	.endif
174		169
		170	.if ${ZABBIX_BUILD} == "java"
		171	@${REINPLACE_CMD} -e 's#PID_FILE="/tmp/zabbix_java.pid"#PID_FILE="/var/run/zabbix/zabbix_java.pid"#g' \
		172	${WRKSRC}/src/zabbix_java/settings.sh
		173	.endif
		174
175	.if ${ZABBIX_BUILD} != "agent"	175	.if ${ZABBIX_BUILD} != "agent"
176	. for d in mysql oracle postgresql sqlite3	176	. for d in mysql oracle postgresql sqlite3
177	@${REINPLACE_CMD} \	177	@${REINPLACE_CMD} \
Lines 189-200 Link Here
189		189
190	post-install:	190	post-install:
191		191
192	.if ${PORT_OPTIONS:MJAVAGW}	192	.if ${ZABBIX_BUILD} == "java"
193	${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \	193	${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh \
194	${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample	194	${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
195	.endif	195	.endif
196		196
197	.if ${ZABBIX_BUILD} != "agent"	197	.if ${ZABBIX_BUILD} != "agent" && ${ZABBIX_BUILD} != "java"
198	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database	198	${MKDIR} ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/database
199	(cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \	199	(cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches \
200	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/)	200	${STAGEDIR}${DATADIR}/${ZABBIX_BUILD:Q}/upgrades/)

Line 0 Link Here

(-)net-mgmt/zabbix3-java/Makefile (+14 lines)
	1	# $FreeBSD$
	2
	3	PORTNAME= zabbix3
	4	CATEGORIES= net-mgmt
	5	PKGNAMESUFFIX= -java
	6
	7	MASTERDIR= ${.CURDIR}/../zabbix3-server
	8	PLIST= ${PKGDIR}/pkg-plist.java
	9
	10	OPTIONS_DEFINE= IPV6
	11
	12	USE_JAVA= yes
	13
	14	.include "${MASTERDIR}/Makefile"

Line 0 Link Here

(-)net-mgmt/zabbix3-server/files/zabbix_java.in (+34 lines)
	1	#!/bin/sh
	2
	3	# PROVIDE: zabbix_java
	4	# REQUIRE: NETWORKING SERVERS
	5	# BEFORE: DAEMON
	6	# KEYWORD: shutdown
	7	#
	8	# Options to configure zabbix_java via /etc/rc.conf:
	9	#
	10	# zabbix_java_enable (bool):
	11	# Enable service on boot.
	12	# Default: NO
	13	#
	14
	15	. /etc/rc.subr
	16
	17	name="zabbix_java"
	18	rcvar=zabbix_java_enable
	19
	20	load_rc_config $name
	21
	22	: ${zabbix_java_enable:=NO}
	23
	24	start_cmd="%%PREFIX%%/sbin/zabbix_java/startup.sh"
	25	stop_cmd="%%PREFIX%%/sbin/zabbix_java/shutdown.sh"
	26	start_precmd=zabbix_java_precmd
	27
	28	zabbix_java_precmd() {
	29	if [ ! -d /var/run/zabbix ] ; then
	30	install -d -m 0755 -o zabbix -g zabbix /var/run/zabbix
	31	fi
	32	}
	33
	34	run_rc_command "$1"

Lines 33-48 Link Here

(-)net-mgmt/zabbix3-server/pkg-plist (-10 lines)
33	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql	33	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
34	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql	34	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
35	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql	35	%%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
36	%%JAVAGW%%sbin/zabbix_java/shutdown.sh
37	%%JAVAGW%%sbin/zabbix_java/lib/logback-console.xml
38	%%JAVAGW%%sbin/zabbix_java/lib/logback-core-0.9.27.jar
39	%%JAVAGW%%sbin/zabbix_java/lib/logback-classic-0.9.27.jar
40	%%JAVAGW%%sbin/zabbix_java/lib/logback.xml
41	%%JAVAGW%%sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
42	%%JAVAGW%%sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
43	%%JAVAGW%%sbin/zabbix_java/settings.sh.sample
44	%%JAVAGW%%sbin/zabbix_java/startup.sh
45	%%JAVAGW%%sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
46	%%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts	36	%%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts
47	@dir %%ETCDIR%%/zabbix/externalscripts	37	@dir %%ETCDIR%%/zabbix/externalscripts
48	%%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d	38	%%PROXY%%@dir %%ETCDIR%%/zabbix_proxy.conf.d