[arch-commits] Commit in haproxy/trunk (PKGBUILD haproxy.install haproxy.sysusers)

[Eli Schwartz]

    Date: Monday, January 8, 2018 @ 21:09:28
  Author: eschwartz
Revision: 280577

upgpkg: haproxy 1.8.2-2

migrate to systemd-sysusers

Added:
  haproxy/trunk/haproxy.sysusers
Modified:
  haproxy/trunk/PKGBUILD
  haproxy/trunk/haproxy.install

------------------+
 PKGBUILD         |    9 ++++++---
 haproxy.install  |    6 +-----
 haproxy.sysusers |    1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-08 20:41:29 UTC (rev 280576)
+++ PKGBUILD	2018-01-08 21:09:28 UTC (rev 280577)
@@ -4,7 +4,7 @@
 
 pkgname=haproxy
 pkgver=1.8.2
-pkgrel=1
+pkgrel=2
 
 pkgdesc='Reliable, high performance TCP/HTTP load balancer'
 url='https://haproxy.org/'
@@ -18,10 +18,12 @@
 install=haproxy.install
 
 source=(https://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
-        haproxy.cfg)
+        haproxy.cfg
+        haproxy.sysusers)
 
 md5sums=('5e72829793e163bea93da1df6b4aaa1e'
-         '27941f31d25d5629f4bdef6bc4b2555a')
+         '27941f31d25d5629f4bdef6bc4b2555a'
+         '2f00e81ee2f3f6e51a0cd9acc6f3ff3e')
 
 prepare() {
   cd haproxy-$pkgver
@@ -55,6 +57,7 @@
     install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib
   done
 
+  install -Dm644 ../haproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/haproxy.conf
   install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg
   install -Dm644 contrib/systemd/haproxy.service \
     "$pkgdir"/usr/lib/systemd/system/haproxy.service

Modified: haproxy.install
===================================================================
--- haproxy.install	2018-01-08 20:41:29 UTC (rev 280576)
+++ haproxy.install	2018-01-08 21:09:28 UTC (rev 280577)
@@ -1,12 +1,8 @@
 post_install() {
-  getent passwd haproxy >/dev/null || useradd -r -M -d / \
-    -s /usr/bin/nologin haproxy >/dev/null
-
   printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
   printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
 }
 
 post_upgrade() {
-  printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work."
-  printf '    %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot."
+  post_install $1
 }

Added: haproxy.sysusers
===================================================================
--- haproxy.sysusers	                        (rev 0)
+++ haproxy.sysusers	2018-01-08 21:09:28 UTC (rev 280577)
@@ -0,0 +1 @@
+u haproxy - - -