diff options
Diffstat (limited to 'net-analyzer/zabbix')
| -rw-r--r-- | net-analyzer/zabbix/ChangeLog | 8 | ||||
| -rw-r--r-- | net-analyzer/zabbix/Manifest | 17 | ||||
| -rw-r--r-- | net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild | 401 |
3 files changed, 417 insertions, 9 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index 538b7b91cacf..d2c5b894bf53 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/zabbix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.86 2012/04/24 23:17:53 mattm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.87 2012/04/27 12:27:40 mattm Exp $ + +*zabbix-2.0.0_rc3-r1 (27 Apr 2012) + + 27 Apr 2012; Matthew Marlowe <mattm@gentoo.org> +zabbix-2.0.0_rc3-r1.ebuild: + Number of small fixes for 2.0.0rc3 ebuild, put zabbix java stuff into + /opt/zabbix_java/ *zabbix-2.0.0_rc3 (24 Apr 2012) *zabbix-1.8.12 (24 Apr 2012) diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index ff5a81160e13..db86dceeeb24 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -35,17 +35,18 @@ EBUILD zabbix-1.8.11-r1.ebuild 8506 RMD160 0d717f3add5a2f73287b63334042cce627e79 EBUILD zabbix-1.8.11-r2.ebuild 8597 RMD160 3e2472079da8217a667a0c7ef59c15328a031d08 SHA1 45283233a9859a41d45aa640f80fd88e7189afff SHA256 d3e1ea7092d330d13e0df2601a064a6698cc25357d312efc58d86e785041e4bc EBUILD zabbix-1.8.11.ebuild 8114 RMD160 2d80d2e73501096a5774c03968c6e086aef698aa SHA1 57770f513980bae90ce4c8f147f29549b8504eda SHA256 fb0c86e6369b249945df479e2c0feb78cb50d9672212de9e842c5ff64ad77956 EBUILD zabbix-1.8.12.ebuild 8594 RMD160 88751738a23e425727a528b7aa25e2eead1e3fea SHA1 f4543e0347af77b27cc0c5766f92ad9ff2b089b4 SHA256 a391e2940db4cc01da5d96ee83eadba945a010aac457e54b172ccd73ea7a933f +EBUILD zabbix-2.0.0_rc3-r1.ebuild 10576 RMD160 1bb124c51eb88bad5e39e5e6b68d4d25d8246775 SHA1 88149f6e02d84fff179ae62b2e93fc79fb99cd1e SHA256 f6e512888787d8224320b926ff6eaf74ff90893dbe7ca39919def65c01ea9b62 EBUILD zabbix-2.0.0_rc3.ebuild 9627 RMD160 6ec9c1b61da9e4478af4dce4b58e50cc20d86b6f SHA1 ddc0923f07a9cf8fd9f076dacfc60e7854ef4e90 SHA256 eb21600322bdecc683aa3e9c2b456f5c0acd5c183dcb052f2a326701dcd0d4a7 -MISC ChangeLog 19458 RMD160 69f5b83e1b99f6e70ddc46299acf916b6023f3fe SHA1 8c1f2996507a2f9b418dcb21255d59d8a9dd4e26 SHA256 066e6ffb29c1bfd71daa45f968b025d9d356aa049770202cc24b47c94bbe7169 +MISC ChangeLog 19666 RMD160 c822b08528ba0ae8a164a620c95f3603a11406eb SHA1 08350fb248c243ce1b733f3d80ca7986e8a77c7e SHA256 940e24ee6ab5d1a16f3f7557815c790673997b2964054db6e0d6dcf2002969cd MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJPlzSuAAoJEC1LWXx4YDenqXgH/iWxSDiElFj3tj/cCMqLfucs -wKLPsaP7ThX1B1uTs250odIRjmwOoVB2YuRrYXRG6pAP39N5qrWOL/d0Dgag2A1D -GcYLRLXDQ0AO6FtRuTJBHrAkfqRfkb6OOnFkLxStQVrjz6O6n6XJpG9z/a1evhhZ -pVzG6NowMwovMzi1TyH9p1rDu1jsPeFNsKXofKhBJAFdi3lcxpVrN+1X/ylQOlO3 -vCm26teFtkF+ZYplbeCUSjD+xOwWLkbGFgpqT2Opa6x54fxLWojBW7UMGZs5A91P -PYBP0Y3b5UHNBF+wLb+XsOysT6Ja69vZ142O6wHCXY3a0K9hIb0sW9GspPXSs18= -=eYa1 +iQEcBAEBAgAGBQJPmpDIAAoJEC1LWXx4YDenBXYH/1AtuGTyyVwwenxSO1xhd1WJ +lxvy1NqBfaXCkdQLIKcZsuc8MHRukZjyYMYDuV2ZEwotArGfqAX5sTNSGU6h8oPK +dDn7vyTlvouygscEU1cq9W2vMPprcYYHUx3QUGB+GALS6R/2tXugQMlWuh79lO7b +kBvwxMbD67c2w7c1qcpSpIUqHa9pV33xnaLnlQue0vzRO/GH/pj1hZTegETzcGFs +5/ETK67AXkp72ZZxgZLq41gisDzTOumCRCFmABouguAE9cPN7EjDHJtmuS0fPycX +Hc6Bu+Gy+YdWx+XN4bJ6bGry5Zs5vG49bVoHLYX/nT7lJ/G0xzfPPnXN3t0DYXg= +=ALaQ -----END PGP SIGNATURE----- diff --git a/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild b/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild new file mode 100644 index 000000000000..52ddcc1633b8 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild @@ -0,0 +1,401 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/zabbix-2.0.0_rc3-r1.ebuild,v 1.1 2012/04/27 12:27:40 mattm Exp $ + +EAPI="2" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit eutils flag-o-matic webapp depend.php autotools java-pkg-opt-2 + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers." +HOMEPAGE="http://www.zabbix.com/" +MY_P=${P/_/} +SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="" +IUSE="agent java curl frontend ipv6 jabber ldap mysql openipmi oracle postgres proxy server ssh snmp +sqlite iodbc odbc static" + +COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) + ldap? ( + net-nds/openldap + =dev-libs/cyrus-sasl-2* + net-libs/gnutls + ) + mysql? ( virtual/mysql ) + sqlite? ( =dev-db/sqlite-3* ) + postgres? ( dev-db/postgresql-base ) + oracle? ( dev-db/oracle-instantclient-basic ) + jabber? ( dev-libs/iksemel ) + curl? ( net-misc/curl ) + openipmi? ( sys-libs/openipmi ) + ssh? ( net-libs/libssh2 ) + java? ( >=virtual/jdk-1.4 ) + odbc? ( + iodbc? ( dev-db/libiodbc ) + !iodbc? ( dev-db/unixODBC ) + )" + +RDEPEND="${COMMON_DEPEND} + proxy? ( <=net-analyzer/fping-2.9 ) + server? ( <=net-analyzer/fping-2.9 + app-admin/webapp-config ) + java? ( + >=virtual/jre-1.4 + dev-java/slf4j-api + dev-java/json-simple + ) + frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + dev-util/pkgconfig" + +use frontend && need_php_httpd + +S=${WORKDIR}/${MY_P} + +ZABBIXJAVA_BASE="opt/zabbix_java" + +java_prepare() { + cd "${S}/src/zabbix_java/lib" + rm -v *.jar || die + + java-pkg_jar-from slf4j-api + java-pkg_jar-from json-simple +} + +src_prepare() { + eautoreconf +} + +pkg_setup() { + if use server || use proxy ; then + local dbnum dbtypes="mysql oracle postgres sqlite" dbtype + declare -i dbnum=0 + for dbtype in ${dbtypes}; do + use ${dbtype} && let dbnum++ + done + if [ ${dbnum} -gt 1 ]; then + eerror + eerror "You can't use more than one database type in Zabbix." + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "Multiple database types selected." + elif [ ${dbnum} -lt 1 ]; then + eerror + eerror "Select exactly one database type out of these: ${dbtypes}" + eerror + die "No database type selected." + fi + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + if has_version 'dev-db/oracle-instantclient-basic'; then + ewarn + ewarn "Please ensure you have a full install of the Oracle client." + ewarn "dev-db/oracle-instantclient* is NOT sufficient." + ewarn + fi + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix," + elog "if you have not already done so. Most minor version" + elog "zabbix updates do not require db changes. However, " + elog "you should read the release notes to be sure." + elog + elog "Have a look at /usr/share/zabbix for" + elog "database creation and upgrades." + elog + elog "For more info read the Zabbix manual at" + elog "http://www.zabbix.com/documentation.php" + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" + ewarn "using sendxmpp for Jabber alerts)." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog + + elog + elog "Zabbix will be officially supporting database upgrades from" + elog "2.0.0rc3 to the final 2.0.0 release when it is available." + elog + elog "At some point, there should be some support for upgrading from 1.8.x" + elog "to a 2.0.x release." + elog + elog "Upgrading from all previous 1.9.x or 2.0rc releases is not unsupported." + elog + elog "Note that this is the first gentoo ebuild for 2.0.x and likely" + elog "will need further tuning with bumps/revisions as bugs are closed." + elog + elog "The java use flag is new to 2.0." + elog + elog "Zabbix is incompatible with fping 3.0 - (Zabbix bug #ZBX-4894)." + elog + + # repeat fowners/fperms functionality from src_install() + # here to catch wrong permissions on existing files in + # the live filesystem (yeah, that sucks). + chown -R zabbix:zabbix \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix \ + "${ROOT}"/var/run/zabbix + chmod 0750 \ + "${ROOT}"/etc/zabbix \ + "${ROOT}"/var/lib/zabbix \ + "${ROOT}"/var/lib/zabbix/home \ + "${ROOT}"/var/lib/zabbix/scripts \ + "${ROOT}"/var/log/zabbix \ + "${ROOT}"/var/run/zabbix + + chmod 0640 \ + "${ROOT}"/etc/zabbix/zabbix_* + + if use server || use proxy ; then + # check for fping + fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) + case "${fping_perms}" in + 4[157][157][157]) + ;; + *) + ewarn + ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," + ewarn "you have to make /usr/sbin/fping setuid root and executable" + ewarn "by everyone. Run the following command to fix it:" + ewarn + ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" + ewarn + ewarn "Please be aware that this might impose a security risk," + ewarn "depending on the code quality of fping." + ewarn + ebeep 3 + epause 5 + ;; + esac + fi +} + +src_configure() { + + local myconf + + if use odbc && use iodbc ; then + myconf="${myconf} --with-iodbc --without-unixodbc" + elif use odbc && ! use iodbc; then + myconf="${myconf} --with-unixodbc --without-iodbc" + else + myconf="${myconf} --without-unixodbc --without-iodbc" + fi + + econf \ + $myconf \ + $(use_enable server) \ + $(use_enable proxy) \ + $(use_enable agent) \ + $(use_enable ipv6) \ + $(use_enable static) \ + $(use_enable java) \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres postgresql) \ + $(use_with oracle) \ + $(use_with sqlite sqlite3) \ + $(use_with jabber) \ + $(use_with curl libcurl) \ + $(use_with openipmi openipmi) \ + $(use_with ssh ssh2) \ + || die "econf failed" +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + if use server; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_server.conf \ + "${FILESDIR}/1.6.6"/zabbix_trapper.conf + doinitd \ + "${FILESDIR}/1.6.6"/init.d/zabbix-server + dosbin \ + src/zabbix_server/zabbix_server + dodir \ + /usr/share/zabbix + insinto /usr/share/zabbix + doins -r \ + database \ + create + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_server.conf \ + /etc/zabbix/zabbix_trapper.conf + fperms 0640 \ + /etc/zabbix/zabbix_server.conf \ + /etc/zabbix/zabbix_trapper.conf + fi + + if use proxy; then + doinitd \ + "${FILESDIR}/1.6.6"/init.d/zabbix-proxy + dosbin \ + src/zabbix_proxy/zabbix_proxy + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_proxy.conf + dodir \ + /usr/share/zabbix + insinto /usr/share/zabbix + doins -r \ + database \ + create + fi + + if use agent; then + insinto /etc/zabbix + doins \ + "${FILESDIR}/1.6.6"/zabbix_agent.conf \ + "${FILESDIR}/1.6.6"/zabbix_agentd.conf + doinitd \ + "${FILESDIR}/1.6.6"/init.d/zabbix-agentd + dosbin \ + src/zabbix_agent/zabbix_agent \ + src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + fowners zabbix:zabbix \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + fperms 0640 \ + /etc/zabbix/zabbix_agent.conf \ + /etc/zabbix/zabbix_agentd.conf + fi + + fowners zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agent.conf \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-2.0.0rc3.jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/org-json-2010-12-28.jar \ + src/zabbix_java/lib/slf4j-api-1.6.1.jar + exeinto /${ZABBIXJAVA_BASE}/ + src/zabbix_java/settings.sh \ + src/zabbix_java/startup.sh \ + src/zabbix_java/shutdown.sh + fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} + fi + +} |