[arch-commits] Commit in zabbix/repos (56 files)
Florian Pritz
bluewind at archlinux.org
Wed Oct 25 07:39:16 UTC 2017
Date: Wednesday, October 25, 2017 @ 07:39:16
Author: bluewind
Revision: 308458
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
zabbix/repos/testing-i686/PKGBUILD
(from rev 308457, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-i686/zabbix-agent.service
(from rev 308457, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-i686/zabbix-agent.sysusers
(from rev 308457, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-i686/zabbix-agent.tmpfiles
(from rev 308457, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-i686/zabbix-proxy-mysql.service
(from rev 308457, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-i686/zabbix-proxy-pgsql.service
(from rev 308457, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-i686/zabbix-proxy-sqlite.service
(from rev 308457, zabbix/trunk/zabbix-proxy-sqlite.service)
zabbix/repos/testing-i686/zabbix-proxy.sysusers
(from rev 308457, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-i686/zabbix-proxy.tmpfiles
(from rev 308457, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-i686/zabbix-server-mysql.service
(from rev 308457, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-i686/zabbix-server-pgsql.service
(from rev 308457, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-i686/zabbix-server.install
(from rev 308457, zabbix/trunk/zabbix-server.install)
zabbix/repos/testing-i686/zabbix-server.sysusers
(from rev 308457, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-i686/zabbix-server.tmpfiles
(from rev 308457, zabbix/trunk/zabbix-server.tmpfiles)
zabbix/repos/testing-x86_64/PKGBUILD
(from rev 308457, zabbix/trunk/PKGBUILD)
zabbix/repos/testing-x86_64/zabbix-agent.service
(from rev 308457, zabbix/trunk/zabbix-agent.service)
zabbix/repos/testing-x86_64/zabbix-agent.sysusers
(from rev 308457, zabbix/trunk/zabbix-agent.sysusers)
zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles
(from rev 308457, zabbix/trunk/zabbix-agent.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-proxy-mysql.service
(from rev 308457, zabbix/trunk/zabbix-proxy-mysql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
(from rev 308457, zabbix/trunk/zabbix-proxy-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service
(from rev 308457, zabbix/trunk/zabbix-proxy-sqlite.service)
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
(from rev 308457, zabbix/trunk/zabbix-proxy.sysusers)
zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles
(from rev 308457, zabbix/trunk/zabbix-proxy.tmpfiles)
zabbix/repos/testing-x86_64/zabbix-server-mysql.service
(from rev 308457, zabbix/trunk/zabbix-server-mysql.service)
zabbix/repos/testing-x86_64/zabbix-server-pgsql.service
(from rev 308457, zabbix/trunk/zabbix-server-pgsql.service)
zabbix/repos/testing-x86_64/zabbix-server.install
(from rev 308457, zabbix/trunk/zabbix-server.install)
zabbix/repos/testing-x86_64/zabbix-server.sysusers
(from rev 308457, zabbix/trunk/zabbix-server.sysusers)
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
(from rev 308457, 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-proxy-mysql.service
zabbix/repos/testing-i686/zabbix-proxy-pgsql.service
zabbix/repos/testing-i686/zabbix-proxy-sqlite.service
zabbix/repos/testing-i686/zabbix-proxy.sysusers
zabbix/repos/testing-i686/zabbix-proxy.tmpfiles
zabbix/repos/testing-i686/zabbix-server-mysql.service
zabbix/repos/testing-i686/zabbix-server-pgsql.service
zabbix/repos/testing-i686/zabbix-server.install
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-proxy-mysql.service
zabbix/repos/testing-x86_64/zabbix-proxy-pgsql.service
zabbix/repos/testing-x86_64/zabbix-proxy-sqlite.service
zabbix/repos/testing-x86_64/zabbix-proxy.sysusers
zabbix/repos/testing-x86_64/zabbix-proxy.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.install
zabbix/repos/testing-x86_64/zabbix-server.sysusers
zabbix/repos/testing-x86_64/zabbix-server.tmpfiles
--------------------------------------------+
/PKGBUILD | 362 +++++++++++++++++++++++++++
/zabbix-agent.service | 22 +
/zabbix-agent.sysusers | 2
/zabbix-agent.tmpfiles | 2
/zabbix-proxy-mysql.service | 24 +
/zabbix-proxy-pgsql.service | 24 +
/zabbix-proxy-sqlite.service | 24 +
/zabbix-proxy.sysusers | 2
/zabbix-proxy.tmpfiles | 2
/zabbix-server-mysql.service | 24 +
/zabbix-server-pgsql.service | 24 +
/zabbix-server.install | 24 +
/zabbix-server.sysusers | 2
/zabbix-server.tmpfiles | 2
testing-i686/PKGBUILD | 165 ------------
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-sqlite.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.install | 12
testing-i686/zabbix-server.sysusers | 1
testing-i686/zabbix-server.tmpfiles | 1
testing-x86_64/PKGBUILD | 165 ------------
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-sqlite.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.install | 12
testing-x86_64/zabbix-server.sysusers | 1
testing-x86_64/zabbix-server.tmpfiles | 1
42 files changed, 540 insertions(+), 508 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/PKGBUILD 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,165 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Thore Bödecker <foxxx0 at archlinux.org>
-
-pkgbase=zabbix
-pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
-pkgver=3.4.2
-pkgrel=1
-arch=(i686 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=('54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f'
- '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
- 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
- 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
- '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
- '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
- '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
- '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
- 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
- '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
- '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
- 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
- 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
-
- # remove tests that require root privileges
- rm src/test/cli/ceph-authtool/cap*.t
-
- # remove broken tests
- rm src/test/cli/crushtool/build.t
- rm -rf qa/btrfs
- rm src/btrfs_ioc_test.c
-
- # this test will try to perform btrfs operations when a btrfs mount
- # is active on the build host, which will fail
- if mount | grep 'type btrfs' &>/dev/null; then
- sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
- fi
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- mkdir -p build
- cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_SBINDIR=/usr/bin \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
- -DWITH_BABELTRACE=ON \
- -DWITH_CEPHFS=ON \
- -DWITH_FUSE=ON \
- -DWITH_LTTNG=ON \
- -DWITH_LZ4=ON \
- -DWITH_MGR=ON \
- -DWITH_NSS=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DWITH_RADOSGW=ON \
- -DWITH_RADOSGW_BEAST_FRONTEND=ON \
- -DWITH_RDMA=OFF \
- -DWITH_SSL=ON \
- -DWITH_SYSTEM_BOOST=ON \
- -DWITH_SYSTEMD=ON \
- -DWITH_TESTS=ON \
- -DWITH_XFS=ON \
- -DENABLE_SHARED=ON \
- ..
-
- make all
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- export CTEST_PARALLEL_LEVEL="$(nproc)"
- make check
-
- # sometimes processes are not properly terminated...
- for process in ceph-mon ceph-mgr ceph-osd; do
- pkill -9 "$process" || true
- done
-}
-
-package_ceph-libs() {
- depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio'
- 'libutil-linux' 'lttng-ust' 'nss' 'python2' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that goes into the ceph package
- rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/sbin"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/etc"
- rm -rf "${pkgdir}/var"
-}
-
-package_ceph() {
- depends=('ceph-libs' 'babeltrace' 'boost-libs' 'curl' 'fuse2' 'glibc'
- 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libsystemd' 'libutil-linux'
- 'lsb-release' 'lttng-ust' 'ncurses' 'nss' 'python2' 'python2-cherrypy'
- 'python2-jinja' 'python2-pecan' 'python2-prettytable' 'python2-pyopenssl'
- 'python2-setuptools' 'python2-werkzeug' 'snappy' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that is in the ceph-libs package
- find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
- rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},python2.7,rados-classes}
- rm -rf "${pkgdir}/usr/include"
-
- # install tmpfiles.d and sysusers.d stuff
- install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
- install -Dm644 "${srcdir}/ceph.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
-
- # remove debian init script
- rm -rf "${pkgdir}/etc/init.d"
-
- # fix sbin dir (cmake opt seems to have no effect)
- mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
- rm -rf "${pkgdir}/usr/sbin"
-
- # remove drop.ceph.com ssh stuff
- rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
-
- # fix bash completions path
- install -d -m 755 "${pkgdir}/usr/share/bash-completion"
- mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
-
- # fix EnvironmentFile location in systemd service files
- sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
-
- # prepare some paths and set correct permissions
- install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zabbix/repos/testing-i686/PKGBUILD (from rev 308457, zabbix/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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.3
+pkgrel=1
+arch=(i686 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=('00e87db503d332a1e3905d13f36b6ddad32c2514f03060361168655a8d4fd8cf'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
+ '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ '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)
+ 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)
+ 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
+}
Deleted: testing-i686/zabbix-agent.service
===================================================================
--- testing-i686/zabbix-agent.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-agent.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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 308457, zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-i686/zabbix-agent.service (rev 0)
+++ testing-i686/zabbix-agent.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-agent.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-agent 172 - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-i686/zabbix-agent.sysusers (from rev 308457, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-i686/zabbix-agent.sysusers (rev 0)
+++ testing-i686/zabbix-agent.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent
Deleted: testing-i686/zabbix-agent.tmpfiles
===================================================================
--- testing-i686/zabbix-agent.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-agent.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-i686/zabbix-agent.tmpfiles (from rev 308457, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-i686/zabbix-agent.tmpfiles (rev 0)
+++ testing-i686/zabbix-agent.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Deleted: testing-i686/zabbix-proxy-mysql.service
===================================================================
--- testing-i686/zabbix-proxy-mysql.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-proxy-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-mysql.service (from rev 308457, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-i686/zabbix-proxy-mysql.service (rev 0)
+++ testing-i686/zabbix-proxy-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-i686/zabbix-proxy-pgsql.service
===================================================================
--- testing-i686/zabbix-proxy-pgsql.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-proxy-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-pgsql.service (from rev 308457, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-i686/zabbix-proxy-pgsql.service (rev 0)
+++ testing-i686/zabbix-proxy-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-i686/zabbix-proxy-sqlite.service
===================================================================
--- testing-i686/zabbix-proxy-sqlite.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-proxy-sqlite.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-sqlite.service (from rev 308457, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- testing-i686/zabbix-proxy-sqlite.service (rev 0)
+++ testing-i686/zabbix-proxy-sqlite.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-i686/zabbix-proxy.sysusers
===================================================================
--- testing-i686/zabbix-proxy.sysusers 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-proxy.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-proxy 171 - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-i686/zabbix-proxy.sysusers (from rev 308457, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-i686/zabbix-proxy.sysusers (rev 0)
+++ testing-i686/zabbix-proxy.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy
Deleted: testing-i686/zabbix-proxy.tmpfiles
===================================================================
--- testing-i686/zabbix-proxy.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-proxy.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Copied: zabbix/repos/testing-i686/zabbix-proxy.tmpfiles (from rev 308457, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-i686/zabbix-proxy.tmpfiles (rev 0)
+++ testing-i686/zabbix-proxy.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-server-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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 308457, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-i686/zabbix-server-mysql.service (rev 0)
+++ testing-i686/zabbix-server-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-server-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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_postgresql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-i686/zabbix-server-pgsql.service (from rev 308457, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-i686/zabbix-server-pgsql.service (rev 0)
+++ testing-i686/zabbix-server-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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_postgresql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-i686/zabbix-server.install
===================================================================
--- testing-i686/zabbix-server.install 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-server.install 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-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-i686/zabbix-server.install (from rev 308457, zabbix/trunk/zabbix-server.install)
===================================================================
--- testing-i686/zabbix-server.install (rev 0)
+++ testing-i686/zabbix-server.install 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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"
+}
Deleted: testing-i686/zabbix-server.sysusers
===================================================================
--- testing-i686/zabbix-server.sysusers 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-server.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-server 170 - /var/lib/zabbix-server
Copied: zabbix/repos/testing-i686/zabbix-server.sysusers (from rev 308457, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-i686/zabbix-server.sysusers (rev 0)
+++ testing-i686/zabbix-server.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server
Deleted: testing-i686/zabbix-server.tmpfiles
===================================================================
--- testing-i686/zabbix-server.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-i686/zabbix-server.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-i686/zabbix-server.tmpfiles (from rev 308457, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-i686/zabbix-server.tmpfiles (rev 0)
+++ testing-i686/zabbix-server.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/PKGBUILD 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,165 +0,0 @@
-# Maintainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
-# Contributor: Thore Bödecker <foxxx0 at archlinux.org>
-
-pkgbase=zabbix
-pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
-pkgver=3.4.2
-pkgrel=1
-arch=(i686 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=('54c21e04da4ef43380af647c6a0ddff67614337386fa318da021117efe5b334f'
- '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
- 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
- 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
- '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
- '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
- '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
- '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
- 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
- '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
- '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
- 'd8929b2e78b5b178c7eebc32ae00a05b7c9d798cf25950a8745ea4b23734e226'
- 'f842ea0a229513e918ff9641391605d436b7d57cb53d932cdd02e4e8b13c95d9')
-
- # remove tests that require root privileges
- rm src/test/cli/ceph-authtool/cap*.t
-
- # remove broken tests
- rm src/test/cli/crushtool/build.t
- rm -rf qa/btrfs
- rm src/btrfs_ioc_test.c
-
- # this test will try to perform btrfs operations when a btrfs mount
- # is active on the build host, which will fail
- if mount | grep 'type btrfs' &>/dev/null; then
- sed -i '/run-tox-ceph-disk/d' src/test/CMakeLists.txt
- fi
-}
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- mkdir -p build
- cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DCMAKE_INSTALL_SBINDIR=/usr/bin \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib \
- -DWITH_BABELTRACE=ON \
- -DWITH_CEPHFS=ON \
- -DWITH_FUSE=ON \
- -DWITH_LTTNG=ON \
- -DWITH_LZ4=ON \
- -DWITH_MGR=ON \
- -DWITH_NSS=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DWITH_RADOSGW=ON \
- -DWITH_RADOSGW_BEAST_FRONTEND=ON \
- -DWITH_RDMA=OFF \
- -DWITH_SSL=ON \
- -DWITH_SYSTEM_BOOST=ON \
- -DWITH_SYSTEMD=ON \
- -DWITH_TESTS=ON \
- -DWITH_XFS=ON \
- -DENABLE_SHARED=ON \
- ..
-
- make all
-}
-
-check() {
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- export CTEST_PARALLEL_LEVEL="$(nproc)"
- make check
-
- # sometimes processes are not properly terminated...
- for process in ceph-mon ceph-mgr ceph-osd; do
- pkill -9 "$process" || true
- done
-}
-
-package_ceph-libs() {
- depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio'
- 'libutil-linux' 'lttng-ust' 'nss' 'python2' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that goes into the ceph package
- rm -rf "${pkgdir}"/usr/lib/{ceph/mgr,systemd,sysusers.d,tmpfiles.d}
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/sbin"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/etc"
- rm -rf "${pkgdir}/var"
-}
-
-package_ceph() {
- depends=('ceph-libs' 'babeltrace' 'boost-libs' 'curl' 'fuse2' 'glibc'
- 'gperftools' 'keyutils' 'leveldb' 'libaio' 'libsystemd' 'libutil-linux'
- 'lsb-release' 'lttng-ust' 'ncurses' 'nss' 'python2' 'python2-cherrypy'
- 'python2-jinja' 'python2-pecan' 'python2-prettytable' 'python2-pyopenssl'
- 'python2-setuptools' 'python2-werkzeug' 'snappy' 'xfsprogs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}/build"
-
- # main install
- make DESTDIR="$pkgdir" install
-
- # remove stuff that is in the ceph-libs package
- find "${pkgdir}/usr/lib" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib" -maxdepth 1 -type l -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type f -delete
- find "${pkgdir}/usr/lib/ceph" -maxdepth 1 -type l -delete
- rm -rf "${pkgdir}"/usr/lib/{ceph/{compressor,crypto,erasure-code},python2.7,rados-classes}
- rm -rf "${pkgdir}/usr/include"
-
- # install tmpfiles.d and sysusers.d stuff
- install -Dm644 "${srcdir}/${pkgbase}-${pkgver}/systemd/ceph.tmpfiles.d" \
- "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf"
- install -Dm644 "${srcdir}/ceph.sysusers" \
- "${pkgdir}/usr/lib/sysusers.d/${pkgbase}.conf"
-
- # remove debian init script
- rm -rf "${pkgdir}/etc/init.d"
-
- # fix sbin dir (cmake opt seems to have no effect)
- mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"
- rm -rf "${pkgdir}/usr/sbin"
-
- # remove drop.ceph.com ssh stuff
- rm -f "${pkgdir}/usr/share/ceph/{{known_hosts,id_rsa}_drop.ceph.com,.pub}"
-
- # fix bash completions path
- install -d -m 755 "${pkgdir}/usr/share/bash-completion"
- mv "$pkgdir"/{etc/bash_completion.d,usr/share/bash-completion/completions}
-
- # fix EnvironmentFile location in systemd service files
- sed -i 's|/etc/sysconfig/|/etc/conf.d/|g' "${pkgdir}"/usr/lib/systemd/system/*.service
-
- # prepare some paths and set correct permissions
- install -D -d -m750 -o 0 -g 340 "${pkgdir}/etc/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/log/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-mds"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-osd"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/bootstrap-rgw"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mon"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/mgr"
- install -D -d -m750 -o 340 -g 340 "${pkgdir}/var/lib/ceph/osd"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: zabbix/repos/testing-x86_64/PKGBUILD (from rev 308457, zabbix/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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.3
+pkgrel=1
+arch=(i686 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=('00e87db503d332a1e3905d13f36b6ddad32c2514f03060361168655a8d4fd8cf'
+ '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
+ 'ef23133aae2340945e621c9725094a3458d9089d3de15f641afcdabdf7c5a39c'
+ 'c38a871d237b00dd6310dfb02e5a8e1b930e445204e73dde8305bed8baf380ec'
+ '7b14586f5b418de6a174c35d466e25ee42c5e4d8190eea4663f4b3e905f91216'
+ '6e49cd520604745aa0febd76d582a2936ad8ab7374c3c9f353ac8c7b1adbbf61'
+ '9fe22526327a0573652c65ff374eba7c36a00b85f8e72d32643d1cc68a07ebbb'
+ '879a7553040d652d1c34044c0ce1e57b809c647b3b037247a5819892a7622a65'
+ 'd06775ebc27cec623d94a3134b4abfb8ddd8e74e3c3483fa1f57f542590e9113'
+ '3394dc819a9915f4710cc3ba1ab24c5f1df1547736d2d40b04eec873e8619e8c'
+ '7592b3b5b66583a57eec83afed3450bae74f6332125396c1dbeeb46f911cb631'
+ '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)
+ 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)
+ 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
+}
Deleted: testing-x86_64/zabbix-agent.service
===================================================================
--- testing-x86_64/zabbix-agent.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-agent.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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 308457, zabbix/trunk/zabbix-agent.service)
===================================================================
--- testing-x86_64/zabbix-agent.service (rev 0)
+++ testing-x86_64/zabbix-agent.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-agent.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-agent 172 - /var/lib/zabbix-agent
Copied: zabbix/repos/testing-x86_64/zabbix-agent.sysusers (from rev 308457, zabbix/trunk/zabbix-agent.sysusers)
===================================================================
--- testing-x86_64/zabbix-agent.sysusers (rev 0)
+++ testing-x86_64/zabbix-agent.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-agent 172 - /var/lib/zabbix-agent
Deleted: testing-x86_64/zabbix-agent.tmpfiles
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Copied: zabbix/repos/testing-x86_64/zabbix-agent.tmpfiles (from rev 308457, zabbix/trunk/zabbix-agent.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-agent.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-agent.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+d /var/lib/zabbix-agent 0750 zabbix-agent zabbix-agent -
Deleted: testing-x86_64/zabbix-proxy-mysql.service
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-proxy-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-mysql.service (from rev 308457, zabbix/trunk/zabbix-proxy-mysql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-mysql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-x86_64/zabbix-proxy-pgsql.service
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-pgsql.service (from rev 308457, zabbix/trunk/zabbix-proxy-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-proxy-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-proxy-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-x86_64/zabbix-proxy-sqlite.service
===================================================================
--- testing-x86_64/zabbix-proxy-sqlite.service 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-proxy-sqlite.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-[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-sqlite.service (from rev 308457, zabbix/trunk/zabbix-proxy-sqlite.service)
===================================================================
--- testing-x86_64/zabbix-proxy-sqlite.service (rev 0)
+++ testing-x86_64/zabbix-proxy-sqlite.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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
Deleted: testing-x86_64/zabbix-proxy.sysusers
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-proxy.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-proxy 171 - /var/lib/zabbix-proxy
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.sysusers (from rev 308457, zabbix/trunk/zabbix-proxy.sysusers)
===================================================================
--- testing-x86_64/zabbix-proxy.sysusers (rev 0)
+++ testing-x86_64/zabbix-proxy.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-proxy 171 - /var/lib/zabbix-proxy
Deleted: testing-x86_64/zabbix-proxy.tmpfiles
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-proxy 0750 zabbix-proxy zabbix-proxy -
Copied: zabbix/repos/testing-x86_64/zabbix-proxy.tmpfiles (from rev 308457, zabbix/trunk/zabbix-proxy.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-proxy.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-proxy.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-server-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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 308457, zabbix/trunk/zabbix-server-mysql.service)
===================================================================
--- testing-x86_64/zabbix-server-mysql.service (rev 0)
+++ testing-x86_64/zabbix-server-mysql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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_postgresql -f
-User=zabbix-server
-
-[Install]
-WantedBy=multi-user.target
Copied: zabbix/repos/testing-x86_64/zabbix-server-pgsql.service (from rev 308457, zabbix/trunk/zabbix-server-pgsql.service)
===================================================================
--- testing-x86_64/zabbix-server-pgsql.service (rev 0)
+++ testing-x86_64/zabbix-server-pgsql.service 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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_postgresql -f
+User=zabbix-server
+
+[Install]
+WantedBy=multi-user.target
Deleted: testing-x86_64/zabbix-server.install
===================================================================
--- testing-x86_64/zabbix-server.install 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-server.install 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1,12 +0,0 @@
-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.install (from rev 308457, zabbix/trunk/zabbix-server.install)
===================================================================
--- testing-x86_64/zabbix-server.install (rev 0)
+++ testing-x86_64/zabbix-server.install 2017-10-25 07:39:16 UTC (rev 308458)
@@ -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"
+}
Deleted: testing-x86_64/zabbix-server.sysusers
===================================================================
--- testing-x86_64/zabbix-server.sysusers 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-server.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-u zabbix-server 170 - /var/lib/zabbix-server
Copied: zabbix/repos/testing-x86_64/zabbix-server.sysusers (from rev 308457, zabbix/trunk/zabbix-server.sysusers)
===================================================================
--- testing-x86_64/zabbix-server.sysusers (rev 0)
+++ testing-x86_64/zabbix-server.sysusers 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+u zabbix-server 170 - /var/lib/zabbix-server
Deleted: testing-x86_64/zabbix-server.tmpfiles
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles 2017-10-25 07:38:52 UTC (rev 308457)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -1 +0,0 @@
-d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
Copied: zabbix/repos/testing-x86_64/zabbix-server.tmpfiles (from rev 308457, zabbix/trunk/zabbix-server.tmpfiles)
===================================================================
--- testing-x86_64/zabbix-server.tmpfiles (rev 0)
+++ testing-x86_64/zabbix-server.tmpfiles 2017-10-25 07:39:16 UTC (rev 308458)
@@ -0,0 +1 @@
+d /var/lib/zabbix-server 0750 zabbix-server zabbix-server -
More information about the arch-commits
mailing list