Date: Wednesday, March 8, 2017 @ 17:39:27 Author: bpiotrowski Revision: 290144
upgpkg: zabbix 3.2.4-2 add split package with proxy Added: zabbix/trunk/zabbix-proxy-mysql.service zabbix/trunk/zabbix-proxy-pgsql.service zabbix/trunk/zabbix-proxy.service zabbix/trunk/zabbix-proxy.sysusers zabbix/trunk/zabbix-proxy.tmpfiles Modified: zabbix/trunk/PKGBUILD ----------------------------+ PKGBUILD | 67 +++++++++++++++++++++++++++++++------------ zabbix-proxy-mysql.service | 12 +++++++ zabbix-proxy-pgsql.service | 12 +++++++ zabbix-proxy.service | 12 +++++++ zabbix-proxy.sysusers | 1 zabbix-proxy.tmpfiles | 1 6 files changed, 87 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-08 15:30:11 UTC (rev 290143) +++ PKGBUILD 2017-03-08 17:39:27 UTC (rev 290144) @@ -3,31 +3,32 @@ # Maintainer: Florian Pritz <bluew...@xinu.at> pkgbase=zabbix -pkgname=(zabbix-server zabbix-agent zabbix-frontend-php) +pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php) pkgver=3.2.4 -pkgrel=1 +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 - zabbix-agent.sysusers - zabbix-agent.tmpfiles - zabbix-server-mysql.service - zabbix-server-pgsql.service - zabbix-server.service - zabbix-server.sysusers - zabbix-server.tmpfiles) + 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' - '5362a7e06cadb9844397a51ef9b3d9269e122a69a66ba83ad569f419815eccae' 'ee4d5c0b8fb71eb166223d358285e29396ba49300ce42c2ae630d7efb963bf59' - '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65') + '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65' + 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113' + '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c' + '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631' + 'd966cf3587ad3960bf6a139ea90e4730caf0d75589ae168d7b31c6ac9b0f64d4' + 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9') prepare() { cd $pkgbase-$pkgver @@ -34,19 +35,20 @@ sed -i \ -e '/^LogFile=.*/d' \ -e 's/# LogType=file/LogType=system/' \ - conf/zabbix_agentd.conf conf/zabbix_server.conf + conf/zabbix_{agentd,proxy,server}.conf } build() { _configure_flags=( + --disable-static --prefix=/usr + --infodir=/usr/share/info + --mandir=/usr/share/man --sysconfdir=/etc/zabbix - --mandir=/usr/share/man - --infodir=/usr/share/info - --disable-static - --enable-server --enable-agent --enable-ipv6 + --enable-proxy + --enable-server --with-ldap --with-libcurl --with-libxml2 @@ -63,12 +65,13 @@ 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) + depends=(net-snmp curl libxml2 sqlite unixodbc libldap) optdepends=('postgresql-libs: for PostgreSQL support' 'libmariadbclient: for MariaDB support') backup=(etc/zabbix/zabbix_server.conf) @@ -132,6 +135,34 @@ "$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) Added: zabbix-proxy-mysql.service =================================================================== --- zabbix-proxy-mysql.service (rev 0) +++ zabbix-proxy-mysql.service 2017-03-08 17:39:27 UTC (rev 290144) @@ -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 Added: zabbix-proxy-pgsql.service =================================================================== --- zabbix-proxy-pgsql.service (rev 0) +++ zabbix-proxy-pgsql.service 2017-03-08 17:39:27 UTC (rev 290144) @@ -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 Added: zabbix-proxy.service =================================================================== --- zabbix-proxy.service (rev 0) +++ zabbix-proxy.service 2017-03-08 17:39:27 UTC (rev 290144) @@ -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 Added: zabbix-proxy.sysusers =================================================================== --- zabbix-proxy.sysusers (rev 0) +++ zabbix-proxy.sysusers 2017-03-08 17:39:27 UTC (rev 290144) @@ -0,0 +1 @@ +u zabbix-proxy - - /var/lib/zabbix-proxy Added: zabbix-proxy.tmpfiles =================================================================== --- zabbix-proxy.tmpfiles (rev 0) +++ zabbix-proxy.tmpfiles 2017-03-08 17:39:27 UTC (rev 290144) @@ -0,0 +1 @@ +d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
