diff options
| -rw-r--r-- | net-analyzer/zabbix/ChangeLog | 10 | ||||
| -rw-r--r-- | net-analyzer/zabbix/Manifest | 24 | ||||
| -rw-r--r-- | net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1 | 25 | ||||
| -rw-r--r-- | net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild | 335 |
4 files changed, 377 insertions, 17 deletions
diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog index bc0067549807..1e1c8616198a 100644 --- a/net-analyzer/zabbix/ChangeLog +++ b/net-analyzer/zabbix/ChangeLog @@ -1,6 +1,14 @@ # 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.89 2012/05/05 11:36:48 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.90 2012/05/11 14:57:44 pva Exp $ + +*zabbix-1.8.12-r1 (11 May 2012) + + 11 May 2012; Peter Volkov <pva@gentoo.org> + +files/1.6.6/init.d/zabbix-agentd-r1, +zabbix-1.8.12-r1.ebuild: + Fix problem with agentd service startup in openvz/vserver environment: + processes inside containers are visible from host, and this precludes start + of agentd as start-stop-daemon conciders agentd running. 05 May 2012; Markos Chandras <hwoarang@gentoo.org> zabbix-1.8.11-r2.ebuild: Stable on amd64 wrt bug #414551 diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 151be66a99d7..ef4e9223b2b7 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX 1.4.6/init.d/zabbix-agentd 581 RMD160 8cc0a23e8ebc52a5d4b95620aaf59f475b128b40 SHA1 5bb2adca43c60ab0f4cfa561870707fa73b9f250 SHA256 5afaed3880c7f8d1a13d51d963f2758a0bc3ec982c667cc2aad9c84d44753452 AUX 1.4.6/init.d/zabbix-server 563 RMD160 1aa037f694ae1e11e4807375ed805f4865a3d29e SHA1 7f9bd64343145961400958c881244772e4bd38ad SHA256 8c2bc6b7dc1fb80e6b24536f7acb7ba102975b345da055cc19e33adfcdb95976 @@ -16,6 +16,7 @@ AUX 1.6.5/zabbix_proxy.conf 4509 RMD160 9efacc29f9e592484cfd4e7cf1cb121886f7318b AUX 1.6.5/zabbix_server.conf 3922 RMD160 a38ff076d34a9807d60b67ec3df3a428f03a8095 SHA1 48fbeabd262d0552f0cb86c39b3f645788077a11 SHA256 4210390a0400b86b090945abab6fdbfe91965d6746a46cf92434dacee4dfe3cb AUX 1.6.5/zabbix_trapper.conf 755 RMD160 c50714a2b95af303737adb117734872ef2545fea SHA1 4acb5a3d01c797f38c278d903430b5ec13557550 SHA256 76af8f79fa28b02c65107753d959c5404faee67c28219e9bce1b29014fab3ca8 AUX 1.6.6/init.d/zabbix-agentd 581 RMD160 b40847b5c626447d0f6099e98c6f98a65f1227c9 SHA1 7e1be4047bd3576f70266460d06a457d5fde3b4c SHA256 f85fa8c293623438d4df9abff3d2bbde0e4527a7062fe045643bebb69d047ffe +AUX 1.6.6/init.d/zabbix-agentd-r1 632 RMD160 1240ea3a340e43666bdb9ea992c08d68cbe44361 SHA1 ac07f93929a67e946f4797f5f853f5f4129c6a7d SHA256 b10ded48eaf74b8ec2f526d6b572c766455483ae1a312bef293faff8205ed59f AUX 1.6.6/init.d/zabbix-proxy 559 RMD160 004ab8e7657abe2d15201a4def0fa5c61e9f138f SHA1 20b00ba5af17d100cc201cdb456819cf25337727 SHA256 d49339ebc7132815b1fa7411ca5aac395b65e10e4972cd743b5e3c3cdcaf9830 AUX 1.6.6/init.d/zabbix-server 563 RMD160 ae69bd294ef0246a884293446c0a149b23799556 SHA1 d8daea6e15d0f1610dfdee62c4f16d2d61fdd6d3 SHA256 95d06003e84fadef7470da4fa0c7ad42fc51dcc7c0eaab77546f43e916478ed5 AUX 1.6.6/postinstall-en.txt 147 RMD160 c0aa1d85021eb046f9c92415fa8e95f9296b046d SHA1 cb5e16baa4cc0a1bf728d94a14fe5e0a85aebcf4 SHA256 3855cb33f7ca570a44e42d578894aba9ebe22fd2992f9f009ca954286f4ba38f @@ -34,25 +35,16 @@ EBUILD zabbix-1.8.10-r2.ebuild 8167 RMD160 3683272abc633fe744b67bcc9c4bfde1f05a6 EBUILD zabbix-1.8.11-r1.ebuild 8506 RMD160 fad80ecd40982795b23180278dddcf4e7d4a3217 SHA1 41d487051c56b7df6d52cc2d8b5a0e9baf393b24 SHA256 e036adbb2e146f302514b1edd60b771c53c6821c1a99b9831ae8289e1d0176fa EBUILD zabbix-1.8.11-r2.ebuild 8598 RMD160 a1c3f81f09baddf656ffddf5b8b974a648f68908 SHA1 9f0120f4b00d876037a6cfaa4dbaf81fdc583d66 SHA256 e53d19f2bb39b7bb261093569728d4b2849522ae3edbc4f68f5771382b334de3 EBUILD zabbix-1.8.11.ebuild 8114 RMD160 6bc85ae007f0da753d7a3bef87356d422c9c60bc SHA1 fce5cd510c93c021bb7fcfce8bf7df6430467f6e SHA256 fc7f721a7ddb92c9577103d88c2accb488cd0fe233b70e10df7996f3418ebfca +EBUILD zabbix-1.8.12-r1.ebuild 8597 RMD160 6eb30770b7fe05ac50583f1f0f7d504669c76454 SHA1 497ffe566083c7c061ff571219566f459d7ada8b SHA256 a7016fa3bdb8987d9c96cbee2a2418e74642d0756951c1e9567064ce00c1ac31 EBUILD zabbix-1.8.12.ebuild 8594 RMD160 bffc3555cd627ca9d634384b5c4dba8f712c4a99 SHA1 566d3f55f8b2dac3b38a751d72e124580f90d1ab SHA256 519885afa5cd2ab933b4d2b196998df2c4e1235e64730fa1a177dc1a8f5603bb EBUILD zabbix-2.0.0_rc3-r1.ebuild 10576 RMD160 a05e8ce5d9e5505de6260386a4c6bbe570eaba6c SHA1 5451d6b41f9a9bc70cb64dd5c95e2de1495130f7 SHA256 92697d3edd34fa22e6bfd52c3b83ceb24bd080e1289ac96895b911e61a4394f3 EBUILD zabbix-2.0.0_rc3.ebuild 9627 RMD160 30ef20984862e054695fd2ca4dec8ed22e62d391 SHA1 eb45c42ff0ade2b68d51933dbdaa77639015eb1a SHA256 f07eebf51b3a596bd1608f745cffa8b2db2129825565f7ccf7fd007e6b3b926e -MISC ChangeLog 20077 RMD160 e0c7af005210cf1c95ad64dd98f2df39d7a7edf0 SHA1 8d149a7b1f86c87b9f5ba93f447b201164eae15b SHA256 bf232c9710f5d4a0ff267a6f767f95bb4c365f4f22f666d40708180548730592 +MISC ChangeLog 20427 RMD160 8a0570ddc44b814a6e0b7bae70ca977537199107 SHA1 006d3ce06ab083287713acea3a10c05341861bcb SHA256 04ccaa9393b49199a4329c0a0b2e5e8815eac6eedd948d9ae1a6f8cebb082626 MISC metadata.xml 1192 RMD160 643f1b9296eba1f769fe042a29700fe1e2969981 SHA1 89f5fc5cff2ae2c6e930465dbb76b576c8b78fc6 SHA256 a1ad2643da11113f3315b4eb42782f514437c7093badc9d91a921c43f1a79141 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJPpRDWAAoJEPqDWhW0r/LCK+wP/0tAO4x+JCWVRxaIS8XeKdXF -07ancOmQCkSvxdtzJHuAUVxl1b6BqNRL6zxl+50n8qK0Az20WxhQizGiUOHjeqlm -868Arm06GD7IPQI3mhcU3W+yH+uxPEoZ/Wia36akCQAiD4qMQdVYkP53fqWePPhl -AbQq9SzKSaFDsXS/1OaahRMlVSpOo3JUXIAqDPXSKOnp2F3T2QlT4zhAtPl2qqgY -ylYDsX7qXqCgRKS47sHHb+UpqcjNJaly2mey+GJ8zAER4wP4NKW1NEOf5Ulyef62 -rDKmywoAG7+LpyHVgewffax3IbJtUcH8AXuNjTlVI01wVHufmVs/FPcbWK9ILL+W -Dw1ZutVSYa8sSZNDyJQU0gkBA4aVkFVz02mJWwjpd+nhclJar7WNhKsPM7s+R+C8 -QqLEslRCrwM4m8onUDYh3/y4+eeX1yt0zoFiBFzWFGANhoBZki3Fkl0AOygqggyk -PliYisxH6XGpjkoBYtoaGJ2bFmEZqNcrKQzPcdus9ytAC/vrZWg07qoEhw7wWy38 -KAF/LdAwWSeANv22kiat+9uh5hdvcRbEH/odFaqB5Ka4rw1rob1ayDOWz27cs5DE -7cXUdJbgyLDIj2t/W1kbgb7pOL2V+6V2nf5jbIQRBrICvIkUi2MIzT5cB6cwjBrQ -vPl8I9eI6ep3aH3s+HK2 -=KFFX +iF4EAREIAAYFAk+tKOoACgkQGrk+8vGYmwe1LQD6Ag291P+TIbzUnGp3R5YfJ5P3 +xOzWpfCZZ9sYdcNb5yIBAJdGUJCaG5NtlR5yx97KdL8wBcK/2R8iVV+EJYhihdx9 +=gDHy -----END PGP SIGNATURE----- diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1 b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1 new file mode 100644 index 000000000000..812d74677094 --- /dev/null +++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1 @@ -0,0 +1,25 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd-r1,v 1.1 2012/05/11 14:57:44 pva Exp $ + +pid_file="/var/run/zabbix/zabbix_agentd.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start() { + ebegin "Starting Zabbix agent" + start-stop-daemon --start --pidfile ${pid_file} \ + --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd + eend $? +} + +stop() { + ebegin "Stopping Zabbix agent" + start-stop-daemon --stop --pidfile ${pid_file} + eend $? +} diff --git a/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild b/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild new file mode 100644 index 000000000000..3c58137717ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-1.8.12-r1.ebuild @@ -0,0 +1,335 @@ +# 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-1.8.12-r1.ebuild,v 1.1 2012/05/11 14:57:44 pva Exp $ + +EAPI="2" + +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit eutils flag-o-matic webapp depend.php autotools + +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="~amd64 ~x86" +IUSE="agent 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 ) + 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 ) + frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] + media-libs/gd[png] + app-admin/webapp-config )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +use frontend && need_php_httpd + +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 need to configure your database for Zabbix." + elog + elog "Have a look at /usr/share/zabbix/database 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 "Add these lines in the /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 "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_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(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/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + 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/database + insinto /usr/share/zabbix/database + doins -r \ + upgrades \ + 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-r1 + 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 + + 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 +} |