From 07ff6f731a4956ab22afe0e00810a72c2a946f16 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Mon, 20 Jul 2020 10:50:35 -0600
Subject: [PATCH] legacy.sr.ht-shim: overhaul init files

---
 sr.ht/legacy.sr.ht-shim/APKBUILD                | 7 +++----
 sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.confd | 6 ------
 sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.initd | 7 +++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/sr.ht/legacy.sr.ht-shim/APKBUILD b/sr.ht/legacy.sr.ht-shim/APKBUILD
index e7424a6..5208625 100644
--- a/sr.ht/legacy.sr.ht-shim/APKBUILD
+++ b/sr.ht/legacy.sr.ht-shim/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=legacy.sr.ht-shim
 pkgver=1.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="legacy.sr.ht API shim service (you don't want to use this)"
 url="https://git.sr.ht/~sircmpwn/legacy.sr.ht-shim"
 arch="noarch"
@@ -14,7 +14,6 @@ source="
 	legacy.sr.ht-shim.initd
 	legacy.sr.ht-shim.confd
 "
-builddir="$srcdir/$pkgname-$pkgver"
 export PKGVER=$pkgver
 options="$options !check"
 install="$pkgname.post-install"
@@ -33,5 +32,5 @@ package() {
 }
 
 sha512sums="4ffaaf522ef18f1fb82b0e3d2a54a6f594edbf6a2e55e9f58c41a36d858a431b617d7252792092ad1669b5df8aafd15c11129db3db84dda61f5d10158aa82f47  legacy.sr.ht-shim-1.0.0.tar.gz
-4eea9b305eef0149339aa8f89223bf78f9fae647f126258cb402e6e547b61e7c1e517de27431c49e839cd9e8c71c3ab6affd86d7f4f21791d8b10a51562753c6  legacy.sr.ht-shim.initd
-fc8dcf636fa146df3bc9eac72c9036f137b50cedacef39b31b5a9991ea8e646932c20ced8afa0cf1617ce9b4cda3fbac5538dd5a6e7bf20ced2890bda1ebd86f  legacy.sr.ht-shim.confd"
+98a10720e0a62e96115ee9f4e5167397191006f5d637da550395adccd5ee240d850bc0df7f15fd244c70316e83407c95a16844ab7e6eeeb81f785b3d9c890c37  legacy.sr.ht-shim.initd
+3d9c5dc7bb33d938d77f30a7bd5df9098e2fc382c701de08101cd1066152065ba03ecf0c6ce47985a2ea078be13171a88e79d90ec742384e4bbe1a5c1d81c640  legacy.sr.ht-shim.confd"
diff --git a/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.confd b/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.confd
index 0b32372..a5df34f 100644
--- a/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.confd
+++ b/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.confd
@@ -6,9 +6,3 @@
 
 # Extra arguments to pass to Gunicorn
 # LEGACYSHIM_ARGS=
-
-# If no, use an external postgresql server
-# LOCAL_PG=yes
-
-# If no, use an external redis server
-# LOCAL_REDIS=yes
diff --git a/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.initd b/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.initd
index 3fa185c..66cb463 100755
--- a/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.initd
+++ b/sr.ht/legacy.sr.ht-shim/legacy.sr.ht-shim.initd
@@ -5,8 +5,6 @@ supervisor=supervise-daemon
 LEGACYSHIM_USER=${LEGACYSHIM_USER:-legacyshim}
 LEGACYSHIM_BIND=${LEGACYSHIM_BIND:-127.0.0.1:5001}
 LEGACYSHIM_ARGS=${LEGACYSHIM_ARGS:-}
-LOCAL_PG=${LOCAL_PG:-yes}
-LOCAL_REDIS=${LOCAL_REDIS:-yes}
 LOGS=/var/log/legacy.sr.ht-shim.log
 supervise_daemon_args="-1 $LOGS -2 $LOGS"
 command="/usr/bin/gunicorn"
@@ -15,8 +13,9 @@ command_user="$LEGACYSHIM_USER:$LEGACYSHIM_USER"
 
 depend() {
 	need net
-	[ "$LOCAL_REDIS" = "yes" ] && need redis
-	[ "$LOCAL_PG" = "yes" ] && need postgresql
+	use redis
+	use postgresql
+	use pgbouncer
 }
 
 start_pre() {
-- 
2.45.2