From: Wolfram Schlich Date: Sun, 11 Feb 2007 22:29:06 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad760d6170ca6dd7b496b3a61cd021cde34ed443;p=gentoo.git version bump Package-Manager: portage-2.1.2 --- diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog index 5974f191d8d6..ef210b839f5a 100644 --- a/net-analyzer/zabbix-server/ChangeLog +++ b/net-analyzer/zabbix-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/zabbix-server -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.8 2006/11/23 19:55:20 vivo Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.9 2007/02/11 22:29:06 wschlich Exp $ + +*zabbix-server-1.1.6 (11 Feb 2007) + + 11 Feb 2007; Wolfram Schlich + +files/1.1.6/init.d/zabbix-server, +files/1.1.6/zabbix_server.conf, + +zabbix-server-1.1.6.ebuild: + version bump 23 Nov 2006; Francesco Riosa zabbix-server-1.0.ebuild, zabbix-server-1.1_alpha7.ebuild, zabbix-server-1.1.ebuild: diff --git a/net-analyzer/zabbix-server/Manifest b/net-analyzer/zabbix-server/Manifest index 1c0dcd24746d..8f05288ecea5 100644 --- a/net-analyzer/zabbix-server/Manifest +++ b/net-analyzer/zabbix-server/Manifest @@ -26,6 +26,14 @@ AUX 1.0/zabbix_trapperd.conf 1197 RMD160 49cd2d3186e590ad94743affc8af245986410db MD5 1a70ae90c2e9f4e94bc5798c80a01697 files/1.0/zabbix_trapperd.conf 1197 RMD160 49cd2d3186e590ad94743affc8af245986410dbe files/1.0/zabbix_trapperd.conf 1197 SHA256 88e5e6fc032d54abc00af805095b8c54b80cb5a560027fb640dba7bf92529cc4 files/1.0/zabbix_trapperd.conf 1197 +AUX 1.1.6/init.d/zabbix-server 571 RMD160 eb6c20bc52b025f5712cff899741bd2da211eed2 SHA1 22aa4cc9de0a31c75f75b4060457a4d0cff359be SHA256 0d67364be444b38f2d19bcc1219db779543f9221d7fc66736998b39bdb42e8fe +MD5 b5bd04fc7ed490b5350dc7b39ab6f1cc files/1.1.6/init.d/zabbix-server 571 +RMD160 eb6c20bc52b025f5712cff899741bd2da211eed2 files/1.1.6/init.d/zabbix-server 571 +SHA256 0d67364be444b38f2d19bcc1219db779543f9221d7fc66736998b39bdb42e8fe files/1.1.6/init.d/zabbix-server 571 +AUX 1.1.6/zabbix_server.conf 2443 RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 SHA1 888914b480f3f3fedbdf66356baf7cf9b0ee063b SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 +MD5 ce48345e4edfa73592e122c2a960e51a files/1.1.6/zabbix_server.conf 2443 +RMD160 01b2f8d48375abf01d22fa7bca82f55fe6151059 files/1.1.6/zabbix_server.conf 2443 +SHA256 1075a5dc88e833f217b87a42ff83a27aa5f0d31ec8f48c466aa4d6588a33fba4 files/1.1.6/zabbix_server.conf 2443 AUX 1.1/init.d/zabbix-server 569 RMD160 7fd0ec8870f94769815017659a73e1bddaed4973 SHA1 3ed7f9640c25e955b03734321051631a30d3809b SHA256 c4581d0251866cfc23cad9d7038c299cc38a410e46c89809d47367418e193e0f MD5 2d0614aa4306e4621d65564824734ee2 files/1.1/init.d/zabbix-server 569 RMD160 7fd0ec8870f94769815017659a73e1bddaed4973 files/1.1/init.d/zabbix-server 569 @@ -55,12 +63,17 @@ MD5 9832a81e134c8e2c11e2a06b7adbf88f files/1.1_alpha7/zabbix_trapper.conf 762 RMD160 b90a6c61ffe5206f9f155979845f82e4ee71de26 files/1.1_alpha7/zabbix_trapper.conf 762 SHA256 3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab files/1.1_alpha7/zabbix_trapper.conf 762 DIST zabbix-1.0.tar.gz 1847471 RMD160 b09b509a05adf1962449356e6a24a9b36a7c914b SHA1 5faf38086f581583953853d9c659b3ac2a37e342 SHA256 3368a2bd825fdc32075b469779037e556b3d02b64bcf8412cd3b8988cafb5e2e +DIST zabbix-1.1.6.tar.gz 1541835 RMD160 93694315a710811631591554807d571de25922c6 SHA1 5756723736d44dad5614a22bead34fb3015fd344 SHA256 348b395df68a808c25cb96287bbb0460e531e46049b6be1bd5be236365022281 DIST zabbix-1.1.tar.gz 1110644 RMD160 4ef49a92117ef4aa9a2369d49008582f7db14b5f SHA1 9ec25938086615a4d00ce745425d0b49d2a94796 SHA256 c544e8b1ba9e3fc62ed283bab058ad753cf3e9ed39ab2aee97c75d483ddfcfa5 DIST zabbix-1.1alpha7.tar.gz 654347 RMD160 2d888d1b22c44d8acd0feb41b51fc14f1c5da357 SHA1 eec928217bd0414181925155636b6003ad16eba4 SHA256 31509e7106c2ff6f197a298b5c8256e24d9b0c9dd9d1d7fe1d81c49393ea471d EBUILD zabbix-server-1.0.ebuild 3101 RMD160 bf1495f65400a85fdeab52e557655459dd35903e SHA1 fc57e608b72fca3b670c5ae6c798479076cf6c9e SHA256 658f8c88a5b1876fe6eda135fc68670614dfd610692f09fb36d535524d8831c5 MD5 553fde062c1a3d773d62f16adb812cb2 zabbix-server-1.0.ebuild 3101 RMD160 bf1495f65400a85fdeab52e557655459dd35903e zabbix-server-1.0.ebuild 3101 SHA256 658f8c88a5b1876fe6eda135fc68670614dfd610692f09fb36d535524d8831c5 zabbix-server-1.0.ebuild 3101 +EBUILD zabbix-server-1.1.6.ebuild 4077 RMD160 b73a95a33ff1397cb40f4b61d2e9fa2f5f0bb303 SHA1 cfe464c5e7a33bb1e92b962abf94e5359c8360c4 SHA256 1740b5d9267d393d36e2624f7a80230de0281918cbfe3c6ab49b2325e1b57ce5 +MD5 2fdb362b1dda76d294ec7f44271df09c zabbix-server-1.1.6.ebuild 4077 +RMD160 b73a95a33ff1397cb40f4b61d2e9fa2f5f0bb303 zabbix-server-1.1.6.ebuild 4077 +SHA256 1740b5d9267d393d36e2624f7a80230de0281918cbfe3c6ab49b2325e1b57ce5 zabbix-server-1.1.6.ebuild 4077 EBUILD zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e SHA1 b8311cfe429043879439bf34d46775f8c6981bb9 SHA256 cbd584bec998673259a49e69949bf7dd4f9c11f1951a066a7218192255af27e0 MD5 9d40eb55431a65d836c3db2aea3e2618 zabbix-server-1.1.ebuild 4499 RMD160 31839444d5d6786bf0fa0752cf81d03de091a05e zabbix-server-1.1.ebuild 4499 @@ -69,10 +82,10 @@ EBUILD zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde MD5 bf4b03ca87fddbd33e7d244948040483 zabbix-server-1.1_alpha7.ebuild 2922 RMD160 743cccb3d05540c6d2d7620b7fbde6aaf37678cc zabbix-server-1.1_alpha7.ebuild 2922 SHA256 6557acf7a2d9c46279568fb300b6007b3380bcfafca88cf857a1b797755148f2 zabbix-server-1.1_alpha7.ebuild 2922 -MISC ChangeLog 3469 RMD160 a497c60dad0155bb3a9ca6762527b7492a72a90a SHA1 cfbebae7752b01fcd62b16394afdbf92a645290c SHA256 c776729cc4f24aa8829c942305898a574196fd1f03e1e0af715ae64ae69a36d3 -MD5 322bbcb2fa5e52065692fcc098e49ce9 ChangeLog 3469 -RMD160 a497c60dad0155bb3a9ca6762527b7492a72a90a ChangeLog 3469 -SHA256 c776729cc4f24aa8829c942305898a574196fd1f03e1e0af715ae64ae69a36d3 ChangeLog 3469 +MISC ChangeLog 3679 RMD160 803d55b63c1b409762ee26ca196f10b89195b80e SHA1 2b034e294b744e548eef08b9e86aba795967eecf SHA256 9d25be43c4c83d3439548acf12f91af2beafe6193b2abde8f6ad1c4aead1618b +MD5 165073678791b75bee7bdbd3537e5733 ChangeLog 3679 +RMD160 803d55b63c1b409762ee26ca196f10b89195b80e ChangeLog 3679 +SHA256 9d25be43c4c83d3439548acf12f91af2beafe6193b2abde8f6ad1c4aead1618b ChangeLog 3679 MISC metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c SHA1 88bffe8fc9f05440edecef1fdc65f4c6dbb6f735 SHA256 770d0897320974215ae8d520cc2f56761e9b53dfa85e9e3081bff1427d8aa03c MD5 d86acab58212886771ef2bf837a2e8b9 metadata.xml 630 RMD160 0ceb5472b6bc0efd1fa4a09f52d3ef953b0cb13c metadata.xml 630 @@ -83,6 +96,9 @@ SHA256 adc1b2731d35da38ae3ac6e127e2936b1880784124d211c6221ba80fbd6fc5a2 files/di MD5 468575e431380e5de6ca61194b44b4c8 files/digest-zabbix-server-1.1 235 RMD160 7779f80429bddb622445164ae2a84d8740f115b7 files/digest-zabbix-server-1.1 235 SHA256 0da858ef9c249d9fe814beefe60ef90c8012f70f022b2f575e6d716d2736971a files/digest-zabbix-server-1.1 235 +MD5 a1d0f58cac49c5da094531e5fb68dc63 files/digest-zabbix-server-1.1.6 241 +RMD160 4db2dcb67da46b927c769925ad5b586c560640d8 files/digest-zabbix-server-1.1.6 241 +SHA256 701463cc9616bad36a48d8c41e6c6df6550247feb98d30f43c78d265f575c87b files/digest-zabbix-server-1.1.6 241 MD5 f080085af8be8617c2127c13020f434f files/digest-zabbix-server-1.1_alpha7 250 RMD160 0e1d1cc3a6a8372bcb03234e4d86e8dca54a9e71 files/digest-zabbix-server-1.1_alpha7 250 SHA256 860ee7a38728bba5a07f32aad43c100948075272e4d527aae150f59fa06785ca files/digest-zabbix-server-1.1_alpha7 250 diff --git a/net-analyzer/zabbix-server/files/1.1.6/init.d/zabbix-server b/net-analyzer/zabbix-server/files/1.1.6/init.d/zabbix-server new file mode 100644 index 000000000000..e9cfd1e5de26 --- /dev/null +++ b/net-analyzer/zabbix-server/files/1.1.6/init.d/zabbix-server @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.1.6/init.d/zabbix-server,v 1.1 2007/02/11 22:29:06 wschlich Exp $ + +depend() { + need net + use mysql postgresql +} + +start() { + ebegin "Starting Zabbix server" + start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server + eend $? +} + +stop() { + ebegin "Stopping Zabbix server" + start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid + eend $? +} diff --git a/net-analyzer/zabbix-server/files/1.1.6/zabbix_server.conf b/net-analyzer/zabbix-server/files/1.1.6/zabbix_server.conf new file mode 100644 index 000000000000..12490f881130 --- /dev/null +++ b/net-analyzer/zabbix-server/files/1.1.6/zabbix_server.conf @@ -0,0 +1,98 @@ +# This is config file for ZABBIX server process +# To get more information about ZABBIX, +# go http://www.zabbix.com + +############ GENERAL PARAMETERS ################# + +# This defines which server this is. +# Default value 1 +# This parameter must be between 1 and 255 +Server=1 + +# Number of pre-forked instances of pollers +# Default value is 6 +# This parameter must be between 6 and 255 +StartPollers=6 + +# Number of pre-forked instances of trappers +# Default value is 5 +# This parameter must be between 2 and 255 +StartTrappers=5 + +# Listen interface for trapper. Trapper will listen all network interfaces +# if this parameter is missing. +ListenIP=127.0.0.1 + +# Listen port for trapping. Default port number is 10051. This parameter +# must be between 1024 and 32767 +ListenPort=10051 + +# How often ZABBIX will perform housekeeping procedure +# (in hours) +# Default value is 1 hour +# Housekeeping is removing unnecessary information from +# tables history, alert, and alarms +# This parameter must be between 1 and 24 +HousekeepingFrequency=1 + +# How often ZABBIX will try to send unsent alerts +# (in seconds) +# Default value is 30 seconds +SenderFrequency=30 + +# Uncomment this line to disable housekeeping procedure +#DisableHousekeeping=1 + +# Specifies debug level +# 0 - debug is not created +# 1 - critical information +# 2 - error information +# 3 - warnings (default) +# 4 - for debugging (produces lots of information) +DebugLevel=3 + +# Specifies how long we wait for agent (in sec) +# Must be between 1 and 30 +Timeout=5 + +# After how many seconds of unreachability treat a host as unavailable +UnreachablePeriod=45 + +# How ofter check host for availability during the unreachability period +UnavailableDelay=15 + +# How ofter check host for availability during the unavailability period +UnavailableDelay=60 + +# Name of PID file +PidFile=/var/run/zabbix/zabbix_server.pid + +# Name of log file +# If not set, syslog is used +LogFile=/var/log/zabbix/zabbix_server.log + +#Location for custom alert scripts +AlertScriptsPath=/var/lib/zabbix/scripts + +#Location of 'fping. Default is /usr/sbin/fping +FpingLocation=/usr/sbin/fping + +# Frequency of ICMP pings. Defauls is 30 second. +PingerFrequency=30 + +# Database host name +# Default is localhost +DBHost=localhost + +# Database name +DBName=zabbix + +# Database user +DBUser=zabbix + +# Database password +# Comment this line if no password used +DBPassword=zabbix + +# Connect to MySQL using Unix socket? +#DBSocket=/var/run/mysqld/mysqld.sock diff --git a/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.6 b/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.6 new file mode 100644 index 000000000000..aede6b7cd4dd --- /dev/null +++ b/net-analyzer/zabbix-server/files/digest-zabbix-server-1.1.6 @@ -0,0 +1,3 @@ +MD5 baa6896c5f41ed286bca3c40e419e1cf zabbix-1.1.6.tar.gz 1541835 +RMD160 93694315a710811631591554807d571de25922c6 zabbix-1.1.6.tar.gz 1541835 +SHA256 348b395df68a808c25cb96287bbb0460e531e46049b6be1bd5be236365022281 zabbix-1.1.6.tar.gz 1541835 diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild new file mode 100644 index 000000000000..b894e0a86ddd --- /dev/null +++ b/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1.6.ebuild,v 1.1 2007/02/11 22:29:06 wschlich Exp $ + +inherit eutils + +MY_P=${PN//-server/} +MY_PV=${PV//_/} +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers. Server part." +HOMEPAGE="http://www.zabbix.com/" +SRC_URI="mirror://sourceforge/zabbix/${MY_P}-${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="ldap mysql oracle postgres snmp" +DEPEND="virtual/libc + snmp? ( net-analyzer/net-snmp ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql )" +RDEPEND="${RDEPEND} net-analyzer/fping" + +S=${WORKDIR}/${MY_P}-${MY_PV} + +pkg_setup() { + if useq 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 +} + +pkg_preinst() { + enewgroup zabbix + enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix +} + +pkg_postinst() { + einfo + einfo "You need to configure your database for Zabbix." + einfo + einfo "Have a look at /usr/share/zabbix/database for" + einfo "database creation and upgrades." + einfo + einfo "For more info read the Zabbix manual at" + einfo "http://www.zabbix.com/manual/v1.1/" + einfo + + zabbix_homedir="$(egetent passwd zabbix | cut -d : -f 6 )" + 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 +} + +src_unpack() { + local dbnum dbtypes="mysql postgres oracle" dbtype + declare -i dbnum=0 + for dbtype in ${dbtypes}; do + useq ${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 + unpack ${A} +} + +src_compile() { + econf \ + --enable-server \ + $(use_with ldap) \ + $(use_with snmp net-snmp) \ + $(use_with mysql) \ + $(use_with postgres pgsql) \ + $(use_with oracle) \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + dodir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix \ + /usr/share/zabbix/database + + keepdir \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + insinto /etc/zabbix + doins ${FILESDIR}/${PV}/zabbix_server.conf + + doinitd ${FILESDIR}/${PV}/init.d/zabbix-server + + fowners zabbix:zabbix \ + /etc/zabbix \ + /etc/zabbix/zabbix_server.conf \ + /usr/share/zabbix/database \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + fperms 0640 \ + /etc/zabbix/zabbix_server.conf + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/log/zabbix \ + /var/run/zabbix + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix/database + doins -r upgrades create + + dodoc README INSTALL NEWS ChangeLog +}