From 4aab09bdfe1eb2378a527e71b9a0c00f9ef03e8b Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Tue, 28 Jul 2020 07:28:01 -0600 Subject: [PATCH] pgbouncer: more group corrections --- sr.ht/pgbouncer/APKBUILD | 4 ++-- sr.ht/pgbouncer/pgbouncer.initd | 2 +- sr.ht/pgbouncer/pgbouncer.pre-install | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sr.ht/pgbouncer/APKBUILD b/sr.ht/pgbouncer/APKBUILD index 1e9052d..0cae2ea 100644 --- a/sr.ht/pgbouncer/APKBUILD +++ b/sr.ht/pgbouncer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista pkgname=pgbouncer pkgver=1.14.0 -pkgrel=1 +pkgrel=2 pkgdesc="A lightweight connection pooler for PostgreSQL" url="https://wiki.postgresql.org/wiki/PgBouncer" arch="all" @@ -48,7 +48,7 @@ package() { } sha512sums="506810c9896a45d67fbc97c3027572278b3857635c222cfaa53b4f3893069cfbee2ec92facd6f387de217bb3170045410b88a7cea09a45686661a2d2ccc85271 pgbouncer-1.14.0.tar.gz -c3b9766eab63e9bf7b21fff7859e094d71530f7e235668f416e81f988cce229835659ea78c22a44859ab116d6fe57c45f4df8acba475ef50835b3bbe3c154a19 pgbouncer.initd +104cdaedb166e8414db0543b91e19cbe931895bc975825cc979a3dd2d5e8e4b425e962b5695970c8a7fb2c0eb4205aa1900a6d67632292a19f71f4dac221f1c1 pgbouncer.initd 808621351b0f5973427fa22f63128432b00ac20fd25af437e8148dad9e55185775aba612b6ecdd58e4a6f2450b8c7838fcace288845b9b3cd0236bbe168aa574 pgbouncer.confd 83b869466b59c1b1d6e316a9368f725181128c1f5a7af230e3fa9c58ccda1bc097db182806c1c51a5121692791ec83d9eb0f5718fb3031f521bb537001153e2d pgbouncer.logrotate f45170465fda5190257e3f4c10e22fe7df57657efc90bdd6a3f0727375a25143e07480ecd998995cec0ddb2ed2d472f996b21e4fe712681418215823b88d0fc3 pgbouncer-dirs.patch" diff --git a/sr.ht/pgbouncer/pgbouncer.initd b/sr.ht/pgbouncer/pgbouncer.initd index 802737d..2a3324d 100644 --- a/sr.ht/pgbouncer/pgbouncer.initd +++ b/sr.ht/pgbouncer/pgbouncer.initd @@ -3,7 +3,7 @@ extra_started_commands="reload" : ${user:="pgbouncer"} -: ${group:="postgresql"} +: ${group:="postgres"} : ${cfgfile:="/etc/pgbouncer/pgbouncer.ini"} : ${nice_timeout:=60} : ${force_quit:="no"} diff --git a/sr.ht/pgbouncer/pgbouncer.pre-install b/sr.ht/pgbouncer/pgbouncer.pre-install index 609b3a9..fd05886 100644 --- a/sr.ht/pgbouncer/pgbouncer.pre-install +++ b/sr.ht/pgbouncer/pgbouncer.pre-install @@ -1,3 +1,3 @@ #!/bin/sh +addgroup -S postgres || true 2>/dev/null adduser -S -D -H -h /dev/null -s /sbin/nologin -G postgres -g pgbouncer pgbouncer 2>/dev/null -exit 0 -- 2.45.2