diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-06 14:14:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-06 14:14:24 +0000 |
| commit | e0d94258e7fab82a3bd9c93307e9e02c1f2140da (patch) | |
| tree | e4f0d474777eb69c43ecc6d8365b750c54cf8c6a | |
| parent | 6590afe4a24933efe65a267d65c59057438fe570 (diff) | |
| download | aports-e0d94258e7fab82a3bd9c93307e9e02c1f2140da.tar.bz2 aports-e0d94258e7fab82a3bd9c93307e9e02c1f2140da.tar.xz | |
backports/zabbix: fix default zabbix_proxy.conf
fixes #2868
| -rw-r--r-- | backports/zabbix/APKBUILD | 8 | ||||
| -rw-r--r-- | backports/zabbix/zabbix_proxy.conf | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/backports/zabbix/APKBUILD b/backports/zabbix/APKBUILD index 94bcf2132e..c5a3cd5eb8 100644 --- a/backports/zabbix/APKBUILD +++ b/backports/zabbix/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=zabbix pkgver=2.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="Enterprise-class open source distributed monitoring" url="http://www.zabbix.com" arch="all" @@ -189,7 +189,7 @@ agent() { md5sums="cb1bda41a742175a445e8d32d103a315 zabbix-2.2.3.tar.gz 26b0401a83bdb1dce29338e5b2786620 zabbix_server.conf 9832a81e134c8e2c11e2a06b7adbf88f zabbix_trapper.conf -0310b92afb3f35c1075fff53db737212 zabbix_proxy.conf +7f9572061afa87382724d929808e0ace zabbix_proxy.conf 721c18077fa739f956340afca9f067f4 zabbix_agentd.conf 3a71e310bd2b38498a7c6830169f7480 zabbix-getloadavg.patch bf62c539870874e11de39c60cb974786 automake.patch @@ -202,7 +202,7 @@ c3b399a406f7dd1df0de7b3fae3ed081 002-fix-res_send-on-uclibc.patch" sha256sums="12a75762d474227f9af8b44abe48dd2660a76713335a37fc8147aca3c79844c1 zabbix-2.2.3.tar.gz 3b09a8fdc38216d859022c5966c36f0bcb6984974208cf4c69c17129649efdf5 zabbix_server.conf 3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab zabbix_trapper.conf -0cd9cab17d1a2f791262b683aeedc5115722478a4847cb438aadb51198f67287 zabbix_proxy.conf +6b82233bc7d6f971eb1487cb7b13eda7be00a8d5628653d7f0c4096b6145822e zabbix_proxy.conf 98343193215c9e1bc79ff332688c684f7023da38583bba800acc404b12c6cc51 zabbix_agentd.conf d2c0651c5fa67a1857707552e79ecece7ca95c149042460c40456634bf7611dc zabbix-getloadavg.patch b347ca77660e69bea353c50e2fce0c7c4cc837f782c9f84f74ba92c1a62b4c1b automake.patch @@ -215,7 +215,7 @@ c796e9aa371f50155b396da53504375f35f77bd3941440525dcaf92da33dac99 002-fix-res_se sha512sums="3c582a316ea8c01f21ff2f48de25d3173bfa5515aed5b96758d87f14fa437da01cbe6044372f16aa82c68e1f522f54f2faf1484f7a1be90dbd85925d786e036f zabbix-2.2.3.tar.gz 3170d56a61871e6efadf705c19f864fdecf9420c4263f2a1129245b3b55bd730d1ba5a6a26ea866fc7842c86f7745e51ea28878bb9e9267ed9176499cb75e8bb zabbix_server.conf cd08d907838de646f65316950e8c71deae25be1701e0cc22e5fd2f636c21ef2365a537d247277bafb694cae8c5dbd22eb725c1647797ad3e4ac4b3df2084ef07 zabbix_trapper.conf -a3703641125dda8c13d658ad4e1cf2cde94af01ed953480a37006e354ff58ade4a99b3575e3f095d8639ac9c481be52e25120353d9a4cd2104a68aff4a5596e5 zabbix_proxy.conf +0337268a595043de98281742031319a7950864d44a597b1b638902178e710f50167b56005cddffb30476cb7894053939f664d66185e84b4aac197b73e6860b4a zabbix_proxy.conf 8a3298cb98787f89b4cc0faa6168a1ab59860c60bec159ecd341db25c0903e89061b40d2b37df9e2df99e08b71b57089bcb25f352e7edf09fbc1b0bd3f1034f6 zabbix_agentd.conf b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c zabbix-getloadavg.patch 9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee automake.patch diff --git a/backports/zabbix/zabbix_proxy.conf b/backports/zabbix/zabbix_proxy.conf index 899fac2465..6a6c49c346 100644 --- a/backports/zabbix/zabbix_proxy.conf +++ b/backports/zabbix/zabbix_proxy.conf @@ -132,12 +132,6 @@ LogFile=/var/log/zabbix/zabbix_proxy.log # Maximum size of log file in MB. Set to 0 to disable automatic log rotation. LogFileSize=1 -# Location for custom alert scripts -AlertScriptsPath=/home/zabbix/bin/ - -# Location of external scripts -#ExternalScripts=/etc/zabbix/externalscripts - # Location of 'fping. Default is /usr/sbin/fping # Make sure that fping binary has root permissions and SUID flag set #FpingLocation=/usr/sbin/fping |