[arch-commits] Commit in zabbix/trunk (6 files)

Florian Pritz bluewind at archlinux.org
Thu Mar 30 09:37:42 UTC 2017


    Date: Thursday, March 30, 2017 @ 09:37:41
  Author: bluewind
Revision: 291842

Rename sqlite service, add notice for users upgrading from AUR

upgpkg: zabbix 3.2.4-8

Added:
  zabbix/trunk/zabbix-proxy-sqlite.service
    (from rev 291841, zabbix/trunk/zabbix-proxy.service)
  zabbix/trunk/zabbix-server-sqlite.service
    (from rev 291841, zabbix/trunk/zabbix-server.service)
  zabbix/trunk/zabbix-server.install
Modified:
  zabbix/trunk/PKGBUILD
Deleted:
  zabbix/trunk/zabbix-proxy.service
  zabbix/trunk/zabbix-server.service

------------------------------+
 PKGBUILD                     |   19 ++++++++-----------
 zabbix-proxy-sqlite.service  |   12 ++++++++++++
 zabbix-proxy.service         |   12 ------------
 zabbix-server-sqlite.service |   12 ++++++++++++
 zabbix-server.install        |   12 ++++++++++++
 zabbix-server.service        |   12 ------------
 6 files changed, 44 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-30 04:22:31 UTC (rev 291841)
+++ PKGBUILD	2017-03-30 09:37:41 UTC (rev 291842)
@@ -5,7 +5,7 @@
 pkgbase=zabbix
 pkgname=(zabbix-server zabbix-agent zabbix-proxy zabbix-frontend-php)
 pkgver=3.2.4
-pkgrel=7
+pkgrel=8
 arch=(i686 x86_64)
 url='http://www.zabbix.com/'
 license=(GPL)
@@ -12,8 +12,8 @@
 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})
+	zabbix-server{-sqlite,-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
+	zabbix-proxy{-sqlite,-mysql,-pgsql}.service zabbix-proxy.{sysusers,tmpfiles})
 
 sha256sums=('22cf19ef5a9478df2281bf518e8be38adc7dbc508bf63111e02388ca7aabeef4'
             '484fa9969eab61eaf20043ae08e2615c0569982dff869c985f2e2065da698c6a'
@@ -75,6 +75,7 @@
   optdepends=('postgresql-libs: for PostgreSQL support'
               'libmariadbclient: for MariaDB support')
   backup=(etc/zabbix/zabbix_server.conf)
+  install=zabbix-server.install
 
   cd $pkgbase-$pkgver
 
@@ -93,15 +94,13 @@
   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.service" \
-    "$pkgdir/usr/lib/systemd/system/zabbix-server.service"
+  install -Dm644 "$srcdir/zabbix-server-sqlite.service" \
+    "$pkgdir/usr/lib/systemd/system/zabbix-server-sqlite.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" \
@@ -156,15 +155,13 @@
   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.service" \
-    "$pkgdir/usr/lib/systemd/system/zabbix-proxy.service"
+  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.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" \

Copied: zabbix/trunk/zabbix-proxy-sqlite.service (from rev 291841, zabbix/trunk/zabbix-proxy.service)
===================================================================
--- zabbix-proxy-sqlite.service	                        (rev 0)
+++ zabbix-proxy-sqlite.service	2017-03-30 09:37:41 UTC (rev 291842)
@@ -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: zabbix-proxy.service
===================================================================
--- zabbix-proxy.service	2017-03-30 04:22:31 UTC (rev 291841)
+++ zabbix-proxy.service	2017-03-30 09:37:41 UTC (rev 291842)
@@ -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/trunk/zabbix-server-sqlite.service (from rev 291841, zabbix/trunk/zabbix-server.service)
===================================================================
--- zabbix-server-sqlite.service	                        (rev 0)
+++ zabbix-server-sqlite.service	2017-03-30 09:37:41 UTC (rev 291842)
@@ -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

Added: zabbix-server.install
===================================================================
--- zabbix-server.install	                        (rev 0)
+++ zabbix-server.install	2017-03-30 09:37:41 UTC (rev 291842)
@@ -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: zabbix-server.service
===================================================================
--- zabbix-server.service	2017-03-30 04:22:31 UTC (rev 291841)
+++ zabbix-server.service	2017-03-30 09:37:41 UTC (rev 291842)
@@ -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


More information about the arch-commits mailing list