From 188b09cb919f578f39b1de568789611c0e343995 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 20 Jul 2020 10:47:13 -0600 Subject: [PATCH] todo.sr.ht: overhaul init files --- sr.ht/todo.sr.ht/APKBUILD | 15 ++++++--------- sr.ht/todo.sr.ht/todo.sr.ht-lmtp.confd | 3 --- sr.ht/todo.sr.ht/todo.sr.ht-lmtp.initd | 5 +++-- sr.ht/todo.sr.ht/todo.sr.ht-webhooks.confd | 3 --- sr.ht/todo.sr.ht/todo.sr.ht-webhooks.initd | 6 +++--- sr.ht/todo.sr.ht/todo.sr.ht.confd | 6 ------ sr.ht/todo.sr.ht/todo.sr.ht.initd | 7 +++---- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/sr.ht/todo.sr.ht/APKBUILD b/sr.ht/todo.sr.ht/APKBUILD index 014f841..eedbf2a 100644 --- a/sr.ht/todo.sr.ht/APKBUILD +++ b/sr.ht/todo.sr.ht/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Drew DeVault pkgname=todo.sr.ht -pkgver=0.42.0 +pkgver=0.58.11 pkgrel=0 pkgdesc="sr.ht ticket tracking service" url="https://git.sr.ht/~sircmpwn/todo.sr.ht" @@ -23,18 +23,15 @@ source=" todo.sr.ht-webhooks.confd todo.sr.ht-webhooks.initd " -builddir="$srcdir/$pkgname-$pkgver" export PKGVER=$pkgver options="$options !check" install="$pkgname.post-install $pkgname.post-upgrade" build() { - cd "$builddir" python3 setup.py build } package() { - cd "$builddir" python3 setup.py install --root="$pkgdir" --optimize=1 install -Dm755 "$srcdir"/todo.sr.ht.initd \ "$pkgdir"/etc/init.d/todo.sr.ht @@ -50,10 +47,10 @@ package() { "$pkgdir"/etc/conf.d/todo.sr.ht-webhooks } -sha512sums="2596b97f9d2344d5eb5d260b7615784e23ed605c497f8677285bffb525880152c647339d87172df469055e23300ff959cc1e2cc6623a33cb92836e5019da9ddc todo.sr.ht-0.42.0.tar.gz -05c613adce3b08bbfd9af839e01282eb71dc679bf059c43f94c8122179ffd374a0bb3947cdd2b8ff21503493f413d7199801ac1f065afe731cfde2d4d7a64255 todo.sr.ht.initd -a136bda51bef167c90d0c07f158eb24f0e769b5020723cd4ffe49854080540f1e6ac92dbeec469ad124253603dd6f9484c9b7c69c5d406bb1b72e686e775a147 todo.sr.ht.confd -a35ea2c01e06d37d2452af8245b5ecf5a1c09688472a1efdec31a9ee63eb24f7972ecdd3055147841213e0382dafebd9b8ebc0dfdbca11ef929f507638791c68 todo.sr.ht-lmtp.initd +sha512sums="248527a193990130edcadef28c5d843acd0d2e40ec335f6f8623f795a9c8fa895c1fcb3937035145dc9f338f66b8bbabe7e01bc2e6891794ba70260a7240ff0d todo.sr.ht-0.58.11.tar.gz +9f0c7284e7dd21156efdbad8074651c643ed6eb8aaca70d44fdfc652726930f8f1036d7f5d55f64bfb09e220e9c4d8e17b0abb54793daae44716deea6d122145 todo.sr.ht.initd +289ae27788ec7a1d3462c77250134f809d0e18ff46b5cc793abca53db68d7240e3e5c6c7d694b1950edfdc7fa8d299204b08b5a81373a044cea0649fd79ad94e todo.sr.ht.confd +c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938 todo.sr.ht-lmtp.initd da5ba92a1e3f49850dbaf6eb98e8eb30baf9c7ebd63e493f1b1b2e5f5c05599710daa998ee070b340f125ec9897fad55b47dad0ad3aca83d1a05d70537f607a2 todo.sr.ht-lmtp.confd 2188b57950d9753b7192945a46c8269b5ff7015fbafd55e4539d7499bd2bd278062ec48fd86fe65d17db78131b013d649204cb23c341b14539fc7d5bebc9a40e todo.sr.ht-webhooks.confd -60590361e716e8b932620da02ca83827715c1b38a14f36a867bb93a7265f368586dad5b9e4284e0c1a6700cc2b9366539254708516e7e03d445b1cf318942ead todo.sr.ht-webhooks.initd" +a2e9686eacd4f37262067749b8844c005839cf190751ab9d49f631e1aa61f64541715e19a942ab20f0541db2b7594499c5c12b522c7b4b90176543f05d576eb7 todo.sr.ht-webhooks.initd" diff --git a/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.confd b/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.confd index 9fd4ff5..cc8afea 100644 --- a/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.confd +++ b/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.confd @@ -3,6 +3,3 @@ # Extra arguments to pass to Gunicorn # TODO_ARGS= - -# If no, use an external postgresql server -# LOCAL_PG=yes diff --git a/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.initd b/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.initd index 787cb04..e89529b 100755 --- a/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.initd +++ b/sr.ht/todo.sr.ht/todo.sr.ht-lmtp.initd @@ -4,7 +4,6 @@ description="todo.sr.ht mail processing daemon" supervisor=supervise-daemon TODO_USER=${TODO_USER:-todo} TODO_ARGS=${TODO_ARGS:-} -LOCAL_PG=${LOCAL_PG:-yes} LOGS=/var/log/todo.sr.ht-lmtp.log supervise_daemon_args="-1 $LOGS -2 $LOGS" command="/usr/bin/todosrht-lmtp" @@ -13,7 +12,9 @@ pidfile="/run/${RC_SVCNAME}.pid" depend() { need net - [ "$LOCAL_PG" = "yes" ] && need postgresql + use redis + use postgresql + use pgbouncer } start_pre() { diff --git a/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.confd b/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.confd index 34fdfef..736a3df 100644 --- a/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.confd +++ b/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.confd @@ -3,6 +3,3 @@ # Extra arguments to pass to celery # TODO_ARGS= - -# If no, use an external postgresql server -# LOCAL_PG=yes diff --git a/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.initd b/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.initd index e5d986b..ff13f91 100755 --- a/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.initd +++ b/sr.ht/todo.sr.ht/todo.sr.ht-webhooks.initd @@ -4,7 +4,6 @@ description="todo.sr.ht webhook delivery service" supervisor=supervise-daemon TODO_USER=${TODO_USER:-todo} TODO_ARGS=${TODO_ARGS:-} -LOCAL_PG=${LOCAL_PG:-yes} LOGS=/var/log/todo.sr.ht-webhooks.log supervise_daemon_args="-1 $LOGS -2 $LOGS" command="/usr/bin/celery" @@ -14,8 +13,9 @@ pidfile="/run/${RC_SVCNAME}.pid" depend() { need net - need redis - [ "$LOCAL_PG" == "yes" ] && need postgresql + use redis + use postgresql + use pgbouncer } start_pre() { diff --git a/sr.ht/todo.sr.ht/todo.sr.ht.confd b/sr.ht/todo.sr.ht/todo.sr.ht.confd index 0bdf6c9..105e7d1 100644 --- a/sr.ht/todo.sr.ht/todo.sr.ht.confd +++ b/sr.ht/todo.sr.ht/todo.sr.ht.confd @@ -6,9 +6,3 @@ # Extra arguments to pass to Gunicorn # TODO_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/todo.sr.ht/todo.sr.ht.initd b/sr.ht/todo.sr.ht/todo.sr.ht.initd index 2011e12..b333a8e 100755 --- a/sr.ht/todo.sr.ht/todo.sr.ht.initd +++ b/sr.ht/todo.sr.ht/todo.sr.ht.initd @@ -5,8 +5,6 @@ supervisor=supervise-daemon TODO_USER=${TODO_USER:-todo} TODO_BIND=${TODO_BIND:-127.0.0.1:5003} TODO_ARGS=${TODO_ARGS:-} -LOCAL_PG=${LOCAL_PG:-yes} -LOCAL_REDIS=${LOCAL_REDIS:-yes} LOGS=/var/log/todo.sr.ht.log supervise_daemon_args="-1 $LOGS -2 $LOGS" command="/usr/bin/gunicorn" @@ -16,8 +14,9 @@ pidfile="/run/${RC_SVCNAME}.pid" depend() { need net - [ "$LOCAL_REDIS" = "yes" ] && need redis - [ "$LOCAL_PG" = "yes" ] && need postgresql + use redis + use postgresql + use pgbouncer } start_pre() { -- 2.45.2