Date: Wednesday, March 8, 2017 @ 17:39:47
Author: bpiotrowski
Revision: 290145
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
zabbix/repos/testing-i686/PKGBUILD
(from rev 290144, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-i686/zabbix-agent.service
(from rev 290144, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-i686/zabbix-agent.sysusers
(from rev 290144, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-i686/zabbix-agent.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-i686/zabbix-proxy-mysql.service
(from rev 290144, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-i686/zabbix-proxy-pgsql.service
(from rev 290144, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-i686/zabbix-proxy.service
(from rev 290144, zabbix/trunk/zabbix-proxy.service)
zabbix/repos/testing-i686/zabbix-proxy.sysusers
(from rev 290144, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-i686/zabbix-proxy.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-i686/zabbix-server-mysql.service
(from rev 290144, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-i686/zabbix-server-pgsql.service
(from rev 290144, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-i686/zabbix-server.service
(from rev 290144, zabbix/trunk/zabbix-server.service)
zabbix/repos/testing-i686/zabbix-server.sysusers
(from rev 290144, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-i686/zabbix-server.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-server.tmpfiles)
zabbix/repos/testing-x86_64/PKGBUILD
(from rev 290144, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-x86_64/zabbix-agent.service
(from rev 290144, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
(from rev 290144, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service
(from rev 290144, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
(from rev 290144, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-proxy.service
(from rev 290144, zabbix/trunk/zabbix-proxy.service)
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
(from rev 290144, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
(from rev 290144, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
(from rev 290144, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-server.service
(from rev 290144, zabbix/trunk/zabbix-server.service)
zabbix/repos/testing-x86_64/zabbix-server.sysusers
(from rev 290144, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
(from rev 290144, zabbix/trunk/zabbix-server.tmpfiles)
Deleted:
zabbix/repos/testing-i686/PKGBUILD
zabbix/repos/testing-i686/zabbix-agent.service
zabbix/repos/testing-i686/zabbix-agent.sysusers
zabbix/repos/testing-i686/zabbix-agent.tmpfiles
zabbix/repos/testing-i686/zabbix-server-mysql.service
zabbix/repos/testing-i686/zabbix-server-pgsql.service
zabbix/repos/testing-i686/zabbix-server.service
zabbix/repos/testing-i686/zabbix-server.sysusers
zabbix/repos/testing-i686/zabbix-server.tmpfiles
zabbix/repos/testing-x86_64/PKGBUILD
zabbix/repos/testing-x86_64/zabbix-agent.service
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
zabbix/repos/testing-x86_64/zabbix-server.service
zabbix/repos/testing-x86_64/zabbix-server.sysusers
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
--------------------------------------------+
/PKGBUILD | 348 +++++++++++++++++++++++++++
/zabbix-agent.service | 22 +
/zabbix-agent.sysusers | 2
/zabbix-agent.tmpfiles | 2
/zabbix-server-mysql.service | 24 +
/zabbix-server-pgsql.service | 24 +
/zabbix-server.service | 24 +
/zabbix-server.sysusers | 2
/zabbix-server.tmpfiles | 2
testing-i686/PKGBUILD | 143 -----------
testing-i686/zabbix-agent.service | 11
testing-i686/zabbix-agent.sysusers | 1
testing-i686/zabbix-agent.tmpfiles | 1
testing-i686/zabbix-proxy-mysql.service | 12
testing-i686/zabbix-proxy-pgsql.service | 12
testing-i686/zabbix-proxy.service | 12
testing-i686/zabbix-proxy.sysusers | 1
testing-i686/zabbix-proxy.tmpfiles | 1
testing-i686/zabbix-server-mysql.service | 12
testing-i686/zabbix-server-pgsql.service | 12
testing-i686/zabbix-server.service | 12
testing-i686/zabbix-server.sysusers | 1
testing-i686/zabbix-server.tmpfiles | 1
testing-x86_64/PKGBUILD | 143 -----------
testing-x86_64/zabbix-agent.service | 11
testing-x86_64/zabbix-agent.sysusers | 1
testing-x86_64/zabbix-agent.tmpfiles | 1
testing-x86_64/zabbix-proxy-mysql.service | 12
testing-x86_64/zabbix-proxy-pgsql.service | 12
testing-x86_64/zabbix-proxy.service | 12
testing-x86_64/zabbix-proxy.sysusers | 1
testing-x86_64/zabbix-proxy.tmpfiles | 1
testing-x86_64/zabbix-server-mysql.service | 12
testing-x86_64/zabbix-server-pgsql.service | 12
testing-x86_64/zabbix-server.service | 12
testing-x86_64/zabbix-server.sysusers | 1
testing-x86_64/zabbix-server.tmpfiles | 1
37 files changed, 526 insertions(+), 388 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/PKGBUILD 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1,143 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Maintainer: Florian Pritz <bluew...@xinu.at>
-
-pkgbase=zabbix
-pkgname=(zabbix-server zabbix-agent zabbix-frontend-php)
-pkgver=3.2.4
-pkgrel=1
-arch=(i686 x86_64)
-url='http://www.zabbix.com/'
-license=(GPL)
-makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmysqlclient libldap)
-source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
- zabbix-agent.service
- zabbix-agent.sysusers
- zabbix-agent.tmpfiles
- zabbix-server-mysql.service
- zabbix-server-pgsql.service
- zabbix-server.service
- zabbix-server.sysusers
- zabbix-server.tmpfiles)
-sha256sums=('22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4'
- '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
- 'ce3e08b6561a6dab345efba781ad7ce72480133744ca4ed159cf98db14333c3e'
- 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
- '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
- '6badb68ebda21f4c75540c78b4d53c19fe1a7e64cfab269e3ce4167f4488e144'
- '5362a7e06cadb9844397a51ef9b3d9269e122a69a66ba83ad569f419815eccae'
- 'ee4d5c0b8fb71eb166223d358285e29396ba49300ce42c2ae630d7efb963bf59'
- '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65')
-
-prepare() {
- cd $pkgbase-$pkgver
- sed -i \
- -e '/^LogFile=.*/d' \
- -e 's/# LogType=file/LogType=system/' \
- conf/zabbix_agentd.conf conf/zabbix_server.conf
-}
-
-build() {
- _configure_flags=(
- --prefix=/usr
- --sysconfdir=/etc/zabbix
- --mandir=/usr/share/man
- --infodir=/usr/share/info
- --disable-static
- --enable-server
- --enable-agent
- --enable-ipv6
- --with-ldap
- --with-libcurl
- --with-libxml2
- --with-net-snmp
- --with-openssl
- --with-ssh2
- --with-unixodbc
- )
-
- cd $pkgbase-$pkgver
-
- for db in postgresql mysql sqlite3; do
- ./configure ${_configure_flags[@]} --with-$db
- make clean
- make
- mv src/zabbix_server/zabbix_server{,_$db}
- done
-}
-
-package_zabbix-server() {
- pkgdesc='Monitoring software for networks and applications'
- depends=(net-snmp curl libxml2 sqlite unixodbc)
- optdepends=('postgresql-libs: for PostgreSQL support'
- 'libmariadbclient: for MariaDB support')
- backup=(etc/zabbix/zabbix_server.conf)
-
- cd $pkgbase-$pkgver
-
- for db in postgresql mysql sqlite3; do
- install -Dm755 src/zabbix_server/zabbix_server_$db \
- "$pkgdir/usr/bin/zabbix_server_$db"
-
- install -d "$pkgdir/usr/share/zabbix/$db"
- install -m644 database/$db/*.sql -t "$pkgdir/usr/share/zabbix/$db"
- done
- install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get"
-
- install -Dm644 man/zabbix_server.man
"$pkgdir/usr/share/man/man8/zabbix_server.8"
- install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1"
-
- install -Dm644 conf/zabbix_server.conf
"$pkgdir/etc/zabbix/zabbix_server.conf"
-
- install -Dm644 "$srcdir/zabbix-server.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
- install -Dm644 "$srcdir/zabbix-server-pgsql.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server-pgsql.service"
- install -Dm644 "$srcdir/zabbix-server-mysql.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service"
-
- install -Dm644 "$srcdir/zabbix-server.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
- install -Dm644 "$srcdir/zabbix-server.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/zabbix-server.conf"
- install -Dm644 "$srcdir/zabbix-server.tmpfiles" \
- "$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf"
-}
-
-package_zabbix-agent() {
- pkgdesc='Monitoring agent for Zabbix'
- depends=(curl)
- backup=(etc/zabbix/zabbix_agentd.conf)
-
- cd $pkgbase-$pkgver
- install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd"
- install -Dm755 src/zabbix_sender/zabbix_sender
"$pkgdir/usr/bin/zabbix_sender"
-
- install -Dm644 conf/zabbix_agentd.conf
"$pkgdir/etc/zabbix/zabbix_agentd.conf"
- install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \
- "$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf"
- install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \
- "$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf"
-
- install -Dm644 man/zabbix_agentd.man \
- "$pkgdir/usr/share/man/man8/zabbix_agentd.8"
- install -Dm644 man/zabbix_sender.man \
- "$pkgdir/usr/share/man/man1/zabbix_sender.1"
-
- install -Dm644 "$srcdir/zabbix-agent.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-agent.service"
- install -Dm644 "$srcdir/zabbix-agent.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf"
- install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \
- "$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf"
-}
-
-package_zabbix-frontend-php() {
- pkgdesc='PHP frontend for Zabbix'
- depends=(zabbix-server php php-gd)
-
- cd $pkgbase-$pkgver
- install -d "$pkgdir/usr/share/webapps/zabbix"
- cp -a frontends/php/* "$pkgdir/usr/share/webapps/zabbix"
- chown http:http ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for
http user
-}
Copied: zabbix/repos/testing-i686/PKGBUILD (from rev 290144,
zabbix/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,174 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Maintainer: Florian Pritz <bluew...@xinu.at>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=3.2.4
+pkgrel=2
+arch=(i686 x86_64)
+url='http://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmysqlclient libldap)
+source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
+ zabbix-agent.{service,sysusers,tmpfiles}
+ zabbix-server{,-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
+ zabbix-proxy{,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
+
+sha256sums=('22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ce3e08b6561a6dab345efba781ad7ce72480133744ca4ed159cf98db14333c3e'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '5362a7e06cadb9844397a51ef9b3d9269e122a69a66ba83ad569f419815eccae'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6badb68ebda21f4c75540c78b4d53c19fe1a7e64cfab269e3ce4167f4488e144'
+ 'ee4d5c0b8fb71eb166223d358285e29396ba49300ce42c2ae630d7efb963bf59'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ 'd966cf3587ad3960bf6a139ea90e4730caf0d75589ae168d7b31c6ac9b0f64d4'
+ 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ sed -i \
+ -e '/^LogFile=.*/d' \
+ -e 's/# LogType=file/LogType=system/' \
+ conf/zabbix_{agentd,proxy,server}.conf
+}
+
+build() {
+ _configure_flags=(
+ --disable-static
+ --prefix=/usr
+ --infodir=/usr/share/info
+ --mandir=/usr/share/man
+ --sysconfdir=/etc/zabbix
+ --enable-agent
+ --enable-ipv6
+ --enable-proxy
+ --enable-server
+ --with-ldap
+ --with-libcurl
+ --with-libxml2
+ --with-net-snmp
+ --with-openssl
+ --with-ssh2
+ --with-unixodbc
+ )
+
+ cd $pkgbase-$pkgver
+
+ for db in postgresql mysql sqlite3; do
+ ./configure ${_configure_flags[@]} --with-$db
+ make clean
+ make
+ mv src/zabbix_server/zabbix_server{,_$db}
+ mv src/zabbix_proxy/zabbix_proxy{,_$db}
+ done
+}
+
+package_zabbix-server() {
+ pkgdesc='Monitoring software for networks and applications'
+ depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
+ optdepends=('postgresql-libs: for PostgreSQL support'
+ 'libmariadbclient: for MariaDB support')
+ backup=(etc/zabbix/zabbix_server.conf)
+
+ cd $pkgbase-$pkgver
+
+ for db in postgresql mysql sqlite3; do
+ install -Dm755 src/zabbix_server/zabbix_server_$db \
+ "$pkgdir/usr/bin/zabbix_server_$db"
+
+ install -d "$pkgdir/usr/share/zabbix/$db"
+ install -m644 database/$db/*.sql -t "$pkgdir/usr/share/zabbix/$db"
+ done
+ install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get"
+
+ install -Dm644 man/zabbix_server.man
"$pkgdir/usr/share/man/man8/zabbix_server.8"
+ install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1"
+
+ install -Dm644 conf/zabbix_server.conf
"$pkgdir/etc/zabbix/zabbix_server.conf"
+
+ install -Dm644 "$srcdir/zabbix-server.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
+ install -Dm644 "$srcdir/zabbix-server-pgsql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server-pgsql.service"
+ install -Dm644 "$srcdir/zabbix-server-mysql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service"
+
+ install -Dm644 "$srcdir/zabbix-server.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
+ install -Dm644 "$srcdir/zabbix-server.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-server.conf"
+ install -Dm644 "$srcdir/zabbix-server.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf"
+}
+
+package_zabbix-agent() {
+ pkgdesc='Monitoring agent for Zabbix'
+ depends=(curl)
+ backup=(etc/zabbix/zabbix_agentd.conf)
+
+ cd $pkgbase-$pkgver
+ install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd"
+ install -Dm755 src/zabbix_sender/zabbix_sender
"$pkgdir/usr/bin/zabbix_sender"
+
+ install -Dm644 conf/zabbix_agentd.conf
"$pkgdir/etc/zabbix/zabbix_agentd.conf"
+ install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \
+ "$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf"
+ install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \
+ "$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf"
+
+ install -Dm644 man/zabbix_agentd.man \
+ "$pkgdir/usr/share/man/man8/zabbix_agentd.8"
+ install -Dm644 man/zabbix_sender.man \
+ "$pkgdir/usr/share/man/man1/zabbix_sender.1"
+
+ install -Dm644 "$srcdir/zabbix-agent.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-agent.service"
+ install -Dm644 "$srcdir/zabbix-agent.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf"
+ install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf"
+}
+
+package_zabbix-proxy() {
+ pkgdesc='Data collecting proxy for Zabbix'
+ depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
+ optdepends=('libmysqlclient: for MySQL support'
+ 'postgresql-libs: for PostgreSQL support')
+
+ cd $pkgbase-$pkgver
+ for db in postgresql mysql sqlite3; do
+ install -Dm755 src/zabbix_proxy/zabbix_proxy_$db \
+ "$pkgdir/usr/bin/zabbix_proxy_$db"
+ done
+ install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+
+ install -Dm644 "$srcdir/zabbix-proxy.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy.service"
+ install -Dm644 "$srcdir/zabbix-proxy-pgsql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy-pgsql.service"
+ install -Dm644 "$srcdir/zabbix-proxy-mysql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy-mysql.service"
+
+ install -Dm644 "$srcdir/zabbix-proxy.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy.service"
+ install -Dm644 "$srcdir/zabbix-proxy.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-proxy.conf"
+ install -Dm644 "$srcdir/zabbix-proxy.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-proxy.conf"
+}
+
+package_zabbix-frontend-php() {
+ pkgdesc='PHP frontend for Zabbix'
+ depends=(zabbix-server php php-gd)
+
+ cd $pkgbase-$pkgver
+ install -d "$pkgdir/usr/share/webapps/zabbix"
+ cp -a frontends/php/* "$pkgdir/usr/share/webapps/zabbix"
+ chown http:http ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for
http user
+}
Deleted: testing-i686/zabbix-agent.service
===================================================================
--- testing-i686/zabbix-agent.service 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-agent.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Zabbix Agent
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_agentd -f
-User=zabbix-agent
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-agent.service (from rev 290144,
zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-i686/zabbix-agent.service (rev 0)
+++ testing-i686/zabbix-agent.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Zabbix Agent
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_agentd -f
+User=zabbix-agent
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-agent.sysusers
===================================================================
--- testing-i686/zabbix-agent.sysusers 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-agent.sysusers 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1 +0,0 @@
-u zabbix-agent - - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-i686/zabbix-agent.sysusers (from rev 290144,
zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-i686/zabbix-agent.sysusers (rev 0)
+++ testing-i686/zabbix-agent.sysusers 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+u zabbix-agent - - /var/lib/zabbix-agent
Deleted: testing-i686/zabbix-agent.tmpfiles
===================================================================
--- testing-i686/zabbix-agent.tmpfiles 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-agent.tmpfiles 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-i686/zabbix-agent.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-i686/zabbix-agent.tmpfiles (rev 0)
+++ testing-i686/zabbix-agent.tmpfiles 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-i686/zabbix-proxy-mysql.service (from rev 290144,
zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-i686/zabbix-proxy-mysql.service (rev 0)
+++ testing-i686/zabbix-proxy-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_mysql -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy-pgsql.service (from rev 290144,
zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-i686/zabbix-proxy-pgsql.service (rev 0)
+++ testing-i686/zabbix-proxy-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_pgsql -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy.service (from rev 290144,
zabbix/trunk/zabbix-proxy.service)
===================================================================
--- testing-i686/zabbix-proxy.service (rev 0)
+++ testing-i686/zabbix-proxy.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with SQLite
+After=network.target
+Conflicts=zabbix-proxy-mysql.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_sqlite3 -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-proxy.sysusers (from rev 290144,
zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-i686/zabbix-proxy.sysusers (rev 0)
+++ testing-i686/zabbix-proxy.sysusers 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+u zabbix-proxy - - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-i686/zabbix-proxy.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-i686/zabbix-proxy.tmpfiles (rev 0)
+++ testing-i686/zabbix-proxy.tmpfiles 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Deleted: testing-i686/zabbix-server-mysql.service
===================================================================
--- testing-i686/zabbix-server-mysql.service 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-i686/zabbix-server-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with MySQL
-After=network.target mysql.service
-Conflicts=zabbix-server.service zabbix-server-pgsql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_mysql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server-mysql.service (from rev 290144,
zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-i686/zabbix-server-mysql.service (rev 0)
+++ testing-i686/zabbix-server-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-server.service zabbix-server-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_mysql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server-pgsql.service
===================================================================
--- testing-i686/zabbix-server-pgsql.service 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-i686/zabbix-server-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with PostgreSQL
-After=network.target postgresql.service
-Conflicts=zabbix-server.service zabbix-server-mysql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_pgsql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server-pgsql.service (from rev 290144,
zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-i686/zabbix-server-pgsql.service (rev 0)
+++ testing-i686/zabbix-server-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-server.service zabbix-server-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_pgsql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server.service
===================================================================
--- testing-i686/zabbix-server.service 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-server.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with SQLite
-After=network.target
-Conflicts=zabbix-server-mysql.service zabbix-server-pgsql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_sqlite3 -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server.service (from rev 290144,
zabbix/trunk/zabbix-server.service)
===================================================================
--- testing-i686/zabbix-server.service (rev 0)
+++ testing-i686/zabbix-server.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with SQLite
+After=network.target
+Conflicts=zabbix-server-mysql.service zabbix-server-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_sqlite3 -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server.sysusers
===================================================================
--- testing-i686/zabbix-server.sysusers 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-server.sysusers 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1 +0,0 @@
-u zabbix-server - - /var/lib/zabbix-server
Copied: zabbix/repos/testing-i686/zabbix-server.sysusers (from rev 290144,
zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-i686/zabbix-server.sysusers (rev 0)
+++ testing-i686/zabbix-server.sysusers 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+u zabbix-server - - /var/lib/zabbix-server
Deleted: testing-i686/zabbix-server.tmpfiles
===================================================================
--- testing-i686/zabbix-server.tmpfiles 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-i686/zabbix-server.tmpfiles 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-i686/zabbix-server.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-i686/zabbix-server.tmpfiles (rev 0)
+++ testing-i686/zabbix-server.tmpfiles 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-x86_64/PKGBUILD 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1,143 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
-# Maintainer: Florian Pritz <bluew...@xinu.at>
-
-pkgbase=zabbix
-pkgname=(zabbix-server zabbix-agent zabbix-frontend-php)
-pkgver=3.2.4
-pkgrel=1
-arch=(i686 x86_64)
-url='http://www.zabbix.com/'
-license=(GPL)
-makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmysqlclient libldap)
-source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
- zabbix-agent.service
- zabbix-agent.sysusers
- zabbix-agent.tmpfiles
- zabbix-server-mysql.service
- zabbix-server-pgsql.service
- zabbix-server.service
- zabbix-server.sysusers
- zabbix-server.tmpfiles)
-sha256sums=('22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4'
- '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
- 'ce3e08b6561a6dab345efba781ad7ce72480133744ca4ed159cf98db14333c3e'
- 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
- '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
- '6badb68ebda21f4c75540c78b4d53c19fe1a7e64cfab269e3ce4167f4488e144'
- '5362a7e06cadb9844397a51ef9b3d9269e122a69a66ba83ad569f419815eccae'
- 'ee4d5c0b8fb71eb166223d358285e29396ba49300ce42c2ae630d7efb963bf59'
- '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65')
-
-prepare() {
- cd $pkgbase-$pkgver
- sed -i \
- -e '/^LogFile=.*/d' \
- -e 's/# LogType=file/LogType=system/' \
- conf/zabbix_agentd.conf conf/zabbix_server.conf
-}
-
-build() {
- _configure_flags=(
- --prefix=/usr
- --sysconfdir=/etc/zabbix
- --mandir=/usr/share/man
- --infodir=/usr/share/info
- --disable-static
- --enable-server
- --enable-agent
- --enable-ipv6
- --with-ldap
- --with-libcurl
- --with-libxml2
- --with-net-snmp
- --with-openssl
- --with-ssh2
- --with-unixodbc
- )
-
- cd $pkgbase-$pkgver
-
- for db in postgresql mysql sqlite3; do
- ./configure ${_configure_flags[@]} --with-$db
- make clean
- make
- mv src/zabbix_server/zabbix_server{,_$db}
- done
-}
-
-package_zabbix-server() {
- pkgdesc='Monitoring software for networks and applications'
- depends=(net-snmp curl libxml2 sqlite unixodbc)
- optdepends=('postgresql-libs: for PostgreSQL support'
- 'libmariadbclient: for MariaDB support')
- backup=(etc/zabbix/zabbix_server.conf)
-
- cd $pkgbase-$pkgver
-
- for db in postgresql mysql sqlite3; do
- install -Dm755 src/zabbix_server/zabbix_server_$db \
- "$pkgdir/usr/bin/zabbix_server_$db"
-
- install -d "$pkgdir/usr/share/zabbix/$db"
- install -m644 database/$db/*.sql -t "$pkgdir/usr/share/zabbix/$db"
- done
- install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get"
-
- install -Dm644 man/zabbix_server.man
"$pkgdir/usr/share/man/man8/zabbix_server.8"
- install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1"
-
- install -Dm644 conf/zabbix_server.conf
"$pkgdir/etc/zabbix/zabbix_server.conf"
-
- install -Dm644 "$srcdir/zabbix-server.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
- install -Dm644 "$srcdir/zabbix-server-pgsql.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server-pgsql.service"
- install -Dm644 "$srcdir/zabbix-server-mysql.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service"
-
- install -Dm644 "$srcdir/zabbix-server.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
- install -Dm644 "$srcdir/zabbix-server.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/zabbix-server.conf"
- install -Dm644 "$srcdir/zabbix-server.tmpfiles" \
- "$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf"
-}
-
-package_zabbix-agent() {
- pkgdesc='Monitoring agent for Zabbix'
- depends=(curl)
- backup=(etc/zabbix/zabbix_agentd.conf)
-
- cd $pkgbase-$pkgver
- install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd"
- install -Dm755 src/zabbix_sender/zabbix_sender
"$pkgdir/usr/bin/zabbix_sender"
-
- install -Dm644 conf/zabbix_agentd.conf
"$pkgdir/etc/zabbix/zabbix_agentd.conf"
- install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \
- "$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf"
- install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \
- "$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf"
-
- install -Dm644 man/zabbix_agentd.man \
- "$pkgdir/usr/share/man/man8/zabbix_agentd.8"
- install -Dm644 man/zabbix_sender.man \
- "$pkgdir/usr/share/man/man1/zabbix_sender.1"
-
- install -Dm644 "$srcdir/zabbix-agent.service" \
- "$pkgdir/usr/lib/systemd/system/zabbix-agent.service"
- install -Dm644 "$srcdir/zabbix-agent.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf"
- install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \
- "$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf"
-}
-
-package_zabbix-frontend-php() {
- pkgdesc='PHP frontend for Zabbix'
- depends=(zabbix-server php php-gd)
-
- cd $pkgbase-$pkgver
- install -d "$pkgdir/usr/share/webapps/zabbix"
- cp -a frontends/php/* "$pkgdir/usr/share/webapps/zabbix"
- chown http:http ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for
http user
-}
Copied: zabbix/repos/testing-x86_64/PKGBUILD (from rev 290144,
zabbix/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,174 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrow...@archlinux.org>
+# Maintainer: Florian Pritz <bluew...@xinu.at>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=3.2.4
+pkgrel=2
+arch=(i686 x86_64)
+url='http://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmysqlclient libldap)
+source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
+ zabbix-agent.{service,sysusers,tmpfiles}
+ zabbix-server{,-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
+ zabbix-proxy{,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
+
+sha256sums=('22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ce3e08b6561a6dab345efba781ad7ce72480133744ca4ed159cf98db14333c3e'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '5362a7e06cadb9844397a51ef9b3d9269e122a69a66ba83ad569f419815eccae'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6badb68ebda21f4c75540c78b4d53c19fe1a7e64cfab269e3ce4167f4488e144'
+ 'ee4d5c0b8fb71eb166223d358285e29396ba49300ce42c2ae630d7efb963bf59'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ 'd966cf3587ad3960bf6a139ea90e4730caf0d75589ae168d7b31c6ac9b0f64d4'
+ 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ sed -i \
+ -e '/^LogFile=.*/d' \
+ -e 's/# LogType=file/LogType=system/' \
+ conf/zabbix_{agentd,proxy,server}.conf
+}
+
+build() {
+ _configure_flags=(
+ --disable-static
+ --prefix=/usr
+ --infodir=/usr/share/info
+ --mandir=/usr/share/man
+ --sysconfdir=/etc/zabbix
+ --enable-agent
+ --enable-ipv6
+ --enable-proxy
+ --enable-server
+ --with-ldap
+ --with-libcurl
+ --with-libxml2
+ --with-net-snmp
+ --with-openssl
+ --with-ssh2
+ --with-unixodbc
+ )
+
+ cd $pkgbase-$pkgver
+
+ for db in postgresql mysql sqlite3; do
+ ./configure ${_configure_flags[@]} --with-$db
+ make clean
+ make
+ mv src/zabbix_server/zabbix_server{,_$db}
+ mv src/zabbix_proxy/zabbix_proxy{,_$db}
+ done
+}
+
+package_zabbix-server() {
+ pkgdesc='Monitoring software for networks and applications'
+ depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
+ optdepends=('postgresql-libs: for PostgreSQL support'
+ 'libmariadbclient: for MariaDB support')
+ backup=(etc/zabbix/zabbix_server.conf)
+
+ cd $pkgbase-$pkgver
+
+ for db in postgresql mysql sqlite3; do
+ install -Dm755 src/zabbix_server/zabbix_server_$db \
+ "$pkgdir/usr/bin/zabbix_server_$db"
+
+ install -d "$pkgdir/usr/share/zabbix/$db"
+ install -m644 database/$db/*.sql -t "$pkgdir/usr/share/zabbix/$db"
+ done
+ install -Dm755 src/zabbix_get/zabbix_get "$pkgdir/usr/bin/zabbix_get"
+
+ install -Dm644 man/zabbix_server.man
"$pkgdir/usr/share/man/man8/zabbix_server.8"
+ install -Dm644 man/zabbix_get.man "$pkgdir/usr/share/man/man1/zabbix_get.1"
+
+ install -Dm644 conf/zabbix_server.conf
"$pkgdir/etc/zabbix/zabbix_server.conf"
+
+ install -Dm644 "$srcdir/zabbix-server.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
+ install -Dm644 "$srcdir/zabbix-server-pgsql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server-pgsql.service"
+ install -Dm644 "$srcdir/zabbix-server-mysql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server-mysql.service"
+
+ install -Dm644 "$srcdir/zabbix-server.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
+ install -Dm644 "$srcdir/zabbix-server.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-server.conf"
+ install -Dm644 "$srcdir/zabbix-server.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-server.conf"
+}
+
+package_zabbix-agent() {
+ pkgdesc='Monitoring agent for Zabbix'
+ depends=(curl)
+ backup=(etc/zabbix/zabbix_agentd.conf)
+
+ cd $pkgbase-$pkgver
+ install -Dm755 src/zabbix_agent/zabbix_agentd "$pkgdir/usr/bin/zabbix_agentd"
+ install -Dm755 src/zabbix_sender/zabbix_sender
"$pkgdir/usr/bin/zabbix_sender"
+
+ install -Dm644 conf/zabbix_agentd.conf
"$pkgdir/etc/zabbix/zabbix_agentd.conf"
+ install -Dm644 conf/zabbix_agentd/userparameter_examples.conf \
+ "$pkgdir/usr/share/zabbix-agent/userparameter_examples.conf"
+ install -Dm644 conf/zabbix_agentd/userparameter_mysql.conf \
+ "$pkgdir/usr/share/zabbix-agent/userparameter_mysql.conf"
+
+ install -Dm644 man/zabbix_agentd.man \
+ "$pkgdir/usr/share/man/man8/zabbix_agentd.8"
+ install -Dm644 man/zabbix_sender.man \
+ "$pkgdir/usr/share/man/man1/zabbix_sender.1"
+
+ install -Dm644 "$srcdir/zabbix-agent.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-agent.service"
+ install -Dm644 "$srcdir/zabbix-agent.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-agent.conf"
+ install -Dm644 "$srcdir/zabbix-agent.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-agent.conf"
+}
+
+package_zabbix-proxy() {
+ pkgdesc='Data collecting proxy for Zabbix'
+ depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
+ optdepends=('libmysqlclient: for MySQL support'
+ 'postgresql-libs: for PostgreSQL support')
+
+ cd $pkgbase-$pkgver
+ for db in postgresql mysql sqlite3; do
+ install -Dm755 src/zabbix_proxy/zabbix_proxy_$db \
+ "$pkgdir/usr/bin/zabbix_proxy_$db"
+ done
+ install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+
+ install -Dm644 "$srcdir/zabbix-proxy.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy.service"
+ install -Dm644 "$srcdir/zabbix-proxy-pgsql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy-pgsql.service"
+ install -Dm644 "$srcdir/zabbix-proxy-mysql.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy-mysql.service"
+
+ install -Dm644 "$srcdir/zabbix-proxy.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy.service"
+ install -Dm644 "$srcdir/zabbix-proxy.sysusers" \
+ "$pkgdir/usr/lib/sysusers.d/zabbix-proxy.conf"
+ install -Dm644 "$srcdir/zabbix-proxy.tmpfiles" \
+ "$pkgdir/usr/lib/tmpfiles.d/zabbix-proxy.conf"
+}
+
+package_zabbix-frontend-php() {
+ pkgdesc='PHP frontend for Zabbix'
+ depends=(zabbix-server php php-gd)
+
+ cd $pkgbase-$pkgver
+ install -d "$pkgdir/usr/share/webapps/zabbix"
+ cp -a frontends/php/* "$pkgdir/usr/share/webapps/zabbix"
+ chown http:http ${pkgdir}/usr/share/webapps/zabbix/conf/ # write access for
http user
+}
Deleted: testing-x86_64/zabbix-agent.service
===================================================================
--- testing-x86_64/zabbix-agent.service 2017-03-08 17:39:27 UTC (rev 290144)
+++ testing-x86_64/zabbix-agent.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Zabbix Agent
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_agentd -f
-User=zabbix-agent
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-agent.service (from rev 290144,
zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-x86_64/zabbix-agent.service (rev 0)
+++ testing-x86_64/zabbix-agent.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,11 @@
+[Unit]
+Description=Zabbix Agent
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_agentd -f
+User=zabbix-agent
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-agent.sysusers
===================================================================
--- testing-x86_64/zabbix-agent.sysusers 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-agent.sysusers 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1 +0,0 @@
-u zabbix-agent - - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-x86_64/zabbix-agent.sysusers (from rev 290144,
zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-x86_64/zabbix-agent.sysusers (rev 0)
+++ testing-x86_64/zabbix-agent.sysusers 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+u zabbix-agent - - /var/lib/zabbix-agent
Deleted: testing-x86_64/zabbix-agent.tmpfiles
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service (from rev
290144, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_mysql -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service (from rev
290144, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-proxy.service zabbix-proxy-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_pgsql -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.service (from rev 290144,
zabbix/trunk/zabbix-proxy.service)
===================================================================
--- testing-x86_64/zabbix-proxy.service (rev 0)
+++ testing-x86_64/zabbix-proxy.service 2017-03-08 17:39:47 UTC (rev 290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix proxy with SQLite
+After=network.target
+Conflicts=zabbix-proxy-mysql.service zabbix-proxy-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_proxy_sqlite3 -f
+User=zabbix-proxy
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.sysusers (from rev 290144,
zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers (rev 0)
+++ testing-x86_64/zabbix-proxy.sysusers 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+u zabbix-proxy - - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Deleted: testing-x86_64/zabbix-server-mysql.service
===================================================================
--- testing-x86_64/zabbix-server-mysql.service 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-server-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with MySQL
-After=network.target mysql.service
-Conflicts=zabbix-server.service zabbix-server-pgsql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_mysql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-mysql.service (from rev
290144, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-x86_64/zabbix-server-mysql.service (rev 0)
+++ testing-x86_64/zabbix-server-mysql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with MySQL
+After=network.target mysql.service
+Conflicts=zabbix-server.service zabbix-server-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_mysql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server-pgsql.service
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with PostgreSQL
-After=network.target postgresql.service
-Conflicts=zabbix-server.service zabbix-server-mysql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_pgsql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-pgsql.service (from rev
290144, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with PostgreSQL
+After=network.target postgresql.service
+Conflicts=zabbix-server.service zabbix-server-mysql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_pgsql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server.service
===================================================================
--- testing-x86_64/zabbix-server.service 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-server.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Zabbix Server with SQLite
-After=network.target
-Conflicts=zabbix-server-mysql.service zabbix-server-pgsql.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/zabbix_server_sqlite3 -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server.service (from rev 290144,
zabbix/trunk/zabbix-server.service)
===================================================================
--- testing-x86_64/zabbix-server.service (rev 0)
+++ testing-x86_64/zabbix-server.service 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Zabbix Server with SQLite
+After=network.target
+Conflicts=zabbix-server-mysql.service zabbix-server-pgsql.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/zabbix_server_sqlite3 -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server.sysusers
===================================================================
--- testing-x86_64/zabbix-server.sysusers 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-server.sysusers 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1 +0,0 @@
-u zabbix-server - - /var/lib/zabbix-server
Copied: zabbix/repos/testing-x86_64/zabbix-server.sysusers (from rev 290144,
zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-x86_64/zabbix-server.sysusers (rev 0)
+++ testing-x86_64/zabbix-server.sysusers 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+u zabbix-server - - /var/lib/zabbix-server
Deleted: testing-x86_64/zabbix-server.tmpfiles
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles 2017-03-08 17:39:27 UTC (rev
290144)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-03-08 17:39:47 UTC (rev
290145)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-x86_64/zabbix-server.tmpfiles (from rev 290144,
zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-03-08 17:39:47 UTC (rev
290145)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
