[arch-commits] Commit in zabbix/repos (15 files)
Florian Pritz
bluewind at archlinux.org
Wed Aug 29 18:08:59 UTC 2018
Date: Wednesday, August 29, 2018 @ 18:08:59
Author: bluewind
Revision: 333092
archrelease: copy trunk to testing-x86_64
Added:
zabbix/repos/testing-x86_64/
zabbix/repos/testing-x86_64/PKGBUILD
(from rev 333091, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-x86_64/zabbix-agent.service
(from rev 333091, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
(from rev 333091, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
(from rev 333091, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service
(from rev 333091, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
(from rev 333091, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service
(from rev 333091, zabbix/trunk/zabbix-proxy-sqlite.service)
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
(from rev 333091, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles
(from rev 333091, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
(from rev 333091, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
(from rev 333091, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-server.install
(from rev 333091, zabbix/trunk/zabbix-server.install)
zabbix/repos/testing-x86_64/zabbix-server.sysusers
(from rev 333091, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
(from rev 333091, zabbix/trunk/zabbix-server.tmpfiles)
-----------------------------+
PKGBUILD | 181 ++++++++++++++++++++++++++++++++++++++++++
zabbix-agent.service | 11 ++
zabbix-agent.sysusers | 1
zabbix-agent.tmpfiles | 1
zabbix-proxy-mysql.service | 16 +++
zabbix-proxy-pgsql.service | 16 +++
zabbix-proxy-sqlite.service | 16 +++
zabbix-proxy.sysusers | 1
zabbix-proxy.tmpfiles | 1
zabbix-server-mysql.service | 16 +++
zabbix-server-pgsql.service | 16 +++
zabbix-server.install | 12 ++
zabbix-server.sysusers | 1
zabbix-server.tmpfiles | 1
14 files changed, 290 insertions(+)
Copied: zabbix/repos/testing-x86_64/PKGBUILD (from rev 333091, zabbix/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,181 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+pkgbase=zabbix
+pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
+pkgver=3.4.13
+pkgrel=1
+arch=(x86_64)
+url='http://www.zabbix.com/'
+license=(GPL)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient libldap libevent)
+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{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
+
+sha256sums=('115b70acc78954aac4da0a91012645a216ee4296a7b538b60c2198cc04b905bd'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '931cd9fff3aa4618d8caca426de6c938477dd0201719ddee90bc93736ab04bc8'
+ '0e6d1384071061826370fd508f2a8a2546e9adc2d6abe3242775356ecf35e3bc'
+ '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ '92172f120785dd26b326ee5e4cd335f0011673a4120996bf370c634025305c5a'
+ 'f3451c64d791e6e72ba52225ece5539522bbf30dd0dc9da3349a78a94ee49f64'
+ '98ac011c3c4e1ed04c21b3b669809a798d45d3c2675746dd28fad63615ee7adc'
+ 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
+ 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ sed -i \
+ -e '/^LogFile=.*/d' \
+ -e 's/# LogType=file/LogType=system/' \
+ conf/zabbix_{agentd,proxy,server}.conf
+ autoreconf -fi
+}
+
+build() {
+ _configure_flags=(
+ --disable-static
+ --prefix=/usr
+ --infodir=/usr/share/info
+ --mandir=/usr/share/man
+ --sysconfdir=/etc/zabbix
+ --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; do
+ ./configure ${_configure_flags[@]} --enable-server --with-$db
+ make clean
+ make
+ mv src/zabbix_server/zabbix_server{,_$db}
+ done
+
+ for db in postgresql mysql sqlite3; do
+ ./configure ${_configure_flags[@]} --enable-proxy --with-$db
+ make clean
+ make
+ mv src/zabbix_proxy/zabbix_proxy{,_$db}
+ done
+}
+
+package_zabbix-server() {
+ pkgdesc='Monitoring software for networks and applications'
+ depends=(net-snmp curl libxml2 unixodbc libldap libevent pcre)
+ optdepends=('postgresql-libs: for PostgreSQL support'
+ 'libmariadbclient: for MariaDB support')
+ backup=(etc/zabbix/zabbix_server.conf)
+ install=zabbix-server.install
+
+ cd $pkgbase-$pkgver
+
+ for db in postgresql mysql; do
+ install -Dm755 src/zabbix_server/zabbix_server_$db \
+ "$pkgdir/usr/bin/zabbix_server_$db"
+
+ install -d "$pkgdir/usr/share/$pkgname/$db"
+ install -m644 database/$db/*.sql -t "$pkgdir/usr/share/$pkgname/$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"
+ chown 170:170 "$pkgdir/etc/zabbix/zabbix_server.conf"
+
+ 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.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 pcre)
+ 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"
+ chown 172:172 "$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 pcre)
+ optdepends=('libmariadbclient: for MariaDB support'
+ 'postgresql-libs: for PostgreSQL support')
+ backup=(etc/zabbix/zabbix_proxy.conf)
+
+ cd $pkgbase-$pkgver
+ for db in postgresql mysql sqlite3; do
+ install -Dm755 src/zabbix_proxy/zabbix_proxy_$db \
+ "$pkgdir/usr/bin/zabbix_proxy_$db"
+
+ install -d "$pkgdir/usr/share/$pkgname/$db"
+ install -m644 database/$db/schema.sql -t "$pkgdir/usr/share/$pkgname/$db"
+ done
+ install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+ chown 171:171 "$pkgdir/etc/zabbix/zabbix_proxy.conf"
+
+ install -Dm644 "$srcdir/zabbix-proxy-sqlite.service" \
+ "$pkgdir/usr/lib/systemd/system/zabbix-proxy-sqlite.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.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
+}
Copied: zabbix/repos/testing-x86_64/zabbix-agent.service (from rev 333091, zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-x86_64/zabbix-agent.service (rev 0)
+++ testing-x86_64/zabbix-agent.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -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
Copied: zabbix/repos/testing-x86_64/zabbix-agent.sysusers (from rev 333091, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-x86_64/zabbix-agent.sysusers (rev 0)
+++ testing-x86_64/zabbix-agent.sysusers 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles (from rev 333091, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-agent.tmpfiles 2018-08-29 18:08:59 UTC (rev 333092)
@@ -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 333091, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-mysql.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,16 @@
+[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
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service (from rev 333091, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,16 @@
+[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
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service (from rev 333091, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- testing-x86_64/zabbix-proxy-sqlite.service (rev 0)
+++ testing-x86_64/zabbix-proxy-sqlite.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,16 @@
+[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
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.sysusers (from rev 333091, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers (rev 0)
+++ testing-x86_64/zabbix-proxy.sysusers 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles (from rev 333091, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1 @@
+d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Copied: zabbix/repos/testing-x86_64/zabbix-server-mysql.service (from rev 333091, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-x86_64/zabbix-server-mysql.service (rev 0)
+++ testing-x86_64/zabbix-server-mysql.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,16 @@
+[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
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-pgsql.service (from rev 333091, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-server-pgsql.service 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,16 @@
+[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_postgresql -f
+User=zabbix-server
+PrivateDevices=yes
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server.install (from rev 333091, zabbix/trunk/zabbix-server.install)
===================================================================
--- testing-x86_64/zabbix-server.install (rev 0)
+++ testing-x86_64/zabbix-server.install 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1,12 @@
+post_upgrade() {
+ if [[ $(vercmp $2 3.2.4-8) -lt 0 ]]; then
+ post_install
+ echo "Please note that the sqlite service file has been renamed to zabbix-server-sqlite.service in 3.2.4-8"
+ fi
+}
+
+post_install() {
+ # remove this notice after a month or two
+ echo "If you are upgrading from an AUR package, note that you will have to merge the config file (remove PIDFile),"
+ echo "adjust permissions (dedicated users per package) and enable one of zabbix-server-{sqlite,pgsql,mysql}.service"
+}
Copied: zabbix/repos/testing-x86_64/zabbix-server.sysusers (from rev 333091, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-x86_64/zabbix-server.sysusers (rev 0)
+++ testing-x86_64/zabbix-server.sysusers 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server
Copied: zabbix/repos/testing-x86_64/zabbix-server.tmpfiles (from rev 333091, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-server.tmpfiles 2018-08-29 18:08:59 UTC (rev 333092)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
More information about the arch-commits
mailing list