Upgraded to latest zabbix, fixed some permissions, use postgresql instead of sqlite

ref #251
---
 testing/zabbix/APKBUILD |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testing/zabbix/APKBUILD b/testing/zabbix/APKBUILD
index f597879..c8e0b35 100644
--- a/testing/zabbix/APKBUILD
+++ b/testing/zabbix/APKBUILD
@@ -1,13 +1,13 @@
 # Contributor: Jeff Bilyk <jbilyk at gmail> 
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=zabbix
-pkgver=1.8.2
-pkgrel=3
+pkgver=1.8.3
+pkgrel=0
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="www.zabbix.com"
 license="GPL"
-depends="php php-sqlite3 php-gd fping"
-makedepends="sqlite-dev libiconv-dev"
+depends="php php-pgsql php-gd php-curl php-bcmath php-sockets php-iconv fping"
+makedepends="postgresql-dev curl-dev libiconv-dev"
 install="$pkgname.pre-install"
 pkgusers="zabbix"
 pkggroups="zabbix"
@@ -47,7 +47,9 @@ build() {
 		--enable-agent \
 		--enable-proxy \
 		--enable-ipv6 \
-		--with-sqlite3
+		--with-pgsql \
+		--with-net-snmp \
+		--with-libcurl
 	make || return 1
 }
 
@@ -56,19 +58,17 @@ package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
-	mkdir -p "$pkgdir"/usr/share/webapps/zabbix
-
 	install -d -m0750 -o zabbix -g zabbix \
 		"$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix
 
 	install -d "$pkgdir"/etc/zabbix 
 	install -d "$pkgdir"/usr/share/zabbix/dbms/create/data
 	install -d -m0755 "$_wwwdir"
-	install -D -m0640 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
-	install -D -m0640 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
+	install -D -m0644 "$srcdir"/zabbix_server.conf "$pkgdir"/etc/zabbix/zabbix_server.conf
+	install -D -m0644 "$srcdir"/zabbix_trapper.conf "$pkgdir"/etc/zabbix/zabbix_trapper.conf
 	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/data.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/data.sql
-	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_mysql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_mysql.sql
-	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/mysql.sql "$pkgdir"/usr/share/zabbix/dbms/create/mysql.sql
+	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/data/images_pgsql.sql "$pkgdir"/usr/share/zabbix/dbms/create/data/images_pgsql.sql
+	install -D -m0755 "$srcdir"/zabbix-$pkgver/create/schema/postgresql.sql "$pkgdir"/usr/share/zabbix/dbms/create/postgresql.sql
 	cp -r "$srcdir"/zabbix-$pkgver/frontends/php/* "$_wwwdir"
 	
 	for i in server proxy agentd; do
@@ -78,7 +78,7 @@ package() {
   
 }
 
-md5sums="fa4be4fa7ac20a33cc0aa5c27b827746  zabbix-1.8.2.tar.gz
+md5sums="575c31880d73f6fe41e730874ebfc633  zabbix-1.8.3.tar.gz
 26b0401a83bdb1dce29338e5b2786620  zabbix_server.conf
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
-- 
1.7.3.2



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

On Thu, 2010-12-02 at 13:16 +0000, Duane Hughes wrote:
> Upgraded to latest zabbix, fixed some permissions, use postgresql instead of sqlite
> 
> ref #251

configure: error: Invalid NET-SNMP directory - unable to find net-snmp-config
make: *** No targets specified and no makefile found.  Stop.


Seems like net-snmp-dev is needed in makedepends. I added that.

I wonder if we could ship the database backend in subpackages? so for
postgresql we could apk add zabbix-pgsql or similar.

Thanks!

-nc




---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

That's a good idea. If no one has any objections, i'll implement with next
commit. Thanks for sorting out makedepends!

Duane Hughes

On Thu, Dec 2, 2010 at 6:07 PM, Natanael Copa <ncopa@alpinelinux.org> wrote:

> On Thu, 2010-12-02 at 13:16 +0000, Duane Hughes wrote:
> > Upgraded to latest zabbix, fixed some permissions, use postgresql instead
> of sqlite
> >
> > ref #251
>
> configure: error: Invalid NET-SNMP directory - unable to find
> net-snmp-config
> make: *** No targets specified and no makefile found.  Stop.
>
>
> Seems like net-snmp-dev is needed in makedepends. I added that.
>
> I wonder if we could ship the database backend in subpackages? so for
> postgresql we could apk add zabbix-pgsql or similar.
>
> Thanks!
>
> -nc
>
>
>

On Fri, Dec 3, 2010 at 3:53 PM, Duane Hughes <duanejevon@gmail.com> wrote:

> That's a good idea. If no one has any objections, i'll implement with next
> commit. Thanks for sorting out makedepends!
>
> Duane Hughes
>
>
On second thoughts (and after trying unsuccessfully :-) ) zabbix can't build
with support for more than one database:

       ./configure --prefix=/usr \
                --sysconfdir=/etc \
                --mandir=/usr/share/man \
                --infodir=/usr/share/info \
                --enable-server \
                --enable-agent \
                --enable-proxy \
                --enable-ipv6 \
                --with-pgsql \
                --with-sqlite3 \
                --with-mysql \
                --with-net-snmp \
                --with-libcurl

That yields:

checking if Oracle support is enabled... no
checking for SQLite3 library >= 3.0.0... yes
checking for function sqlite3_open_v2() in sqlite3.h... yes
checking for mysql_config... /usr/bin/mysql_config
checking for main in -lmysqlclient ... yes
configure: error: You can configure for only one database.
make: *** No targets specified and no makefile found.  Stop.
>>> ERROR: zabbix: all failed

So i think i'll leave it as is with postgresql support, unless anyone
prefers something else.

Duane Hughes


> On Thu, Dec 2, 2010 at 6:07 PM, Natanael Copa <ncopa@alpinelinux.org>wrote:
>
>> On Thu, 2010-12-02 at 13:16 +0000, Duane Hughes wrote:
>> > Upgraded to latest zabbix, fixed some permissions, use postgresql
>> instead of sqlite
>> >
>> > ref #251
>>
>> configure: error: Invalid NET-SNMP directory - unable to find
>> net-snmp-config
>> make: *** No targets specified and no makefile found.  Stop.
>>
>>
>> Seems like net-snmp-dev is needed in makedepends. I added that.
>>
>> I wonder if we could ship the database backend in subpackages? so for
>> postgresql we could apk add zabbix-pgsql or similar.
>>
>> Thanks!
>>
>> -nc
>>
>>
>>
>

On Mon, 2010-12-06 at 08:42 +0200, Duane Hughes wrote:

> configure: error: You can configure for only one database.
...
> So i think i'll leave it as is with postgresql support, unless anyone
> prefers something else.

Fair enough.

-nc




---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---