[RFC PATCH sr.ht-apkbuilds] *.sr.ht: Enable prometheus multiprocessing mode

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[RFC PATCH sr.ht-apkbuilds] *.sr.ht: Enable prometheus multiprocessing mode

Ignas Kiela

Details

Message ID: <20210402093435.158778-1-me@ignaskiela.eu>
DKIM signature: pass

Download raw message

14 days ago

Patch: +111 -20

To enable it we need to set the `prometheus_multiproc_dir` environment variable
to a directory the service can access, and set up gunicorn hooks to clean it up
on startup and mark dead workers, which config in core.sr.ht/contrib does.
---
Couldn't bring up a working alpine environment to test this patch so it doesn't
have the updated version numbers or checksums. Haven't tested the service
files either, but from my docs reading they should work. Similar changes should
be added to other package repos. Note that this is a pottentially breaking
change, because if a config file was already given via $<service>_ARGS they will
clash, so this might be worth to be announced in sr.ht-admins.

 sr.ht/builds.sr.ht/APKBUILD               | 4 ++++
 sr.ht/builds.sr.ht/builds.sr.ht.confd     | 3 +++
 sr.ht/builds.sr.ht/builds.sr.ht.initd     | 6 ++++--
 sr.ht/dispatch.sr.ht/APKBUILD             | 5 +++++
 sr.ht/dispatch.sr.ht/dispatch.sr.ht.confd | 3 +++
 sr.ht/dispatch.sr.ht/dispatch.sr.ht.initd | 6 ++++--
 sr.ht/git.sr.ht/APKBUILD                  | 4 ++++
 sr.ht/git.sr.ht/git.sr.ht.confd           | 3 +++
 sr.ht/git.sr.ht/git.sr.ht.initd           | 6 ++++--
 sr.ht/hg.sr.ht/APKBUILD                   | 4 ++++
 sr.ht/hg.sr.ht/hg.sr.ht.confd             | 3 +++
 sr.ht/hg.sr.ht/hg.sr.ht.initd             | 6 ++++--
 sr.ht/hub.sr.ht/APKBUILD                  | 4 ++++
 sr.ht/hub.sr.ht/hub.sr.ht.confd           | 3 +++
 sr.ht/hub.sr.ht/hub.sr.ht.initd           | 6 ++++--
 sr.ht/lists.sr.ht/APKBUILD                | 4 ++++
 sr.ht/lists.sr.ht/lists.sr.ht.confd       | 3 +++
 sr.ht/lists.sr.ht/lists.sr.ht.initd       | 6 ++++--
 sr.ht/man.sr.ht/APKBUILD                  | 4 ++++
 sr.ht/man.sr.ht/man.sr.ht.confd           | 3 +++
 sr.ht/man.sr.ht/man.sr.ht.initd           | 6 ++++--
 sr.ht/meta.sr.ht/APKBUILD                 | 4 ++++
 sr.ht/meta.sr.ht/meta.sr.ht.confd         | 3 +++
 sr.ht/meta.sr.ht/meta.sr.ht.initd         | 6 ++++--
 sr.ht/paste.sr.ht/APKBUILD                | 4 ++++
 sr.ht/paste.sr.ht/paste.sr.ht.confd       | 3 +++
 sr.ht/paste.sr.ht/paste.sr.ht.initd       | 6 ++++--
 sr.ht/todo.sr.ht/APKBUILD                 | 4 ++++
 sr.ht/todo.sr.ht/todo.sr.ht.confd         | 3 +++
 sr.ht/todo.sr.ht/todo.sr.ht.initd         | 6 ++++--
 30 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/sr.ht/builds.sr.ht/APKBUILD b/sr.ht/builds.sr.ht/APKBUILD
index bb74aaa..511f430 100644
--- a/sr.ht/builds.sr.ht/APKBUILD
+++ b/sr.ht/builds.sr.ht/APKBUILD
@@ -24,6 +24,7 @@ subpackages="
 "
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/${pkgver}.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
 	builds.sr.ht.confd
 	builds.sr.ht.initd
@@ -47,6 +48,8 @@ package() {
 		"$pkgdir"/etc/init.d/builds.sr.ht
 	install -Dm644 "$srcdir"/builds.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/builds.sr.ht
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/builds.sr.ht.gunicorn.conf.py
 }
 
 _images() {
@@ -77,6 +80,7 @@ _nginx() {
 
 sha512sums="0aed71d9ba30d01bace46e7e1fff7a355765884b6c3aa71c013a3a980d1bea4899bfd4c5cda76128b862402f7f51e65503138d63553b1938844f6345f6121f78  builds.sr.ht-0.62.5.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.62.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 0e3ede63309393e15e5b4ecd7d9c511ca2ecc6b99b50bac34c876a3261975b723a45643405aeb0c3b2533f879e854c1f2f3c6d152137611ea3fea72b9d52a045  builds.sr.ht.confd
 8efe408c19e088f83ad318d9c5388db1f54956acfd2a7daf75c0728acd40b26244eaea20c74a6f704018e2856831bc931c6646ca2f7842342763070ecc808033  builds.sr.ht.initd
 5aa18804ddfee263763b035780679b98cf4877de193c254f24fab7ce56f304556af9a377bfca36635c21b4380892e8d458a420021919934080cc43feda1694c4  builds.sr.ht-worker.confd
diff --git a/sr.ht/builds.sr.ht/builds.sr.ht.confd b/sr.ht/builds.sr.ht/builds.sr.ht.confd
index f55e7d9..cf80f7e 100644
--- a/sr.ht/builds.sr.ht/builds.sr.ht.confd
+++ b/sr.ht/builds.sr.ht/builds.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # BUILDS_BIND=127.0.0.1:5002
 
+# Gunicorn configuration file
+# BUILDS_GUNICORN_CONF=/etc/sr.ht/builds.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # BUILDS_ARGS=
diff --git a/sr.ht/builds.sr.ht/builds.sr.ht.initd b/sr.ht/builds.sr.ht/builds.sr.ht.initd
index 9cac9f0..478dece 100755
--- a/sr.ht/builds.sr.ht/builds.sr.ht.initd
+++ b/sr.ht/builds.sr.ht/builds.sr.ht.initd
@@ -4,11 +4,13 @@ description="builds.sr.ht service"
 supervisor=supervise-daemon
 BUILDS_USER=${BUILDS_USER:-builds}
 BUILDS_BIND=${BUILDS_BIND:-127.0.0.1:5002}
+BUILDS_GUNICORN_CONF=${BUILDS_GUNICORN_CONF:-/etc/sr.ht/builds.sr.ht.gunicorn.conf.py}
 BUILDS_ARGS=${BUILDS_ARGS:-}
 LOGS=/var/log/builds.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/builds.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="buildsrht.app:app -b $BUILDS_BIND $BUILDS_ARGS"
+command_args="buildsrht.app:app -b $BUILDS_BIND -c $BUILDS_GUNICORN_CONF $BUILDS_ARGS"
 command_user="$BUILDS_USER:$BUILDS_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/dispatch.sr.ht/APKBUILD b/sr.ht/dispatch.sr.ht/APKBUILD
index b8ce698..9135f4c 100644
--- a/sr.ht/dispatch.sr.ht/APKBUILD
+++ b/sr.ht/dispatch.sr.ht/APKBUILD
@@ -16,6 +16,7 @@ makedepends="py-setuptools nodejs sassc"
 subpackages="$pkgname-openrc $pkgname-nginx:_nginx"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
 	dispatch.sr.ht.confd
 	dispatch.sr.ht.initd
@@ -35,6 +36,9 @@ package() {
 		"$pkgdir"/etc/init.d/dispatch.sr.ht
 	install -Dm644 "$srcdir"/dispatch.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/dispatch.sr.ht
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/dispatch.sr.ht.gunicorn.conf.py
+
 }
 
 _nginx() {
@@ -46,5 +50,6 @@ _nginx() {
 
 sha512sums="ee369df1f9bd8aa169f5f6bdbae293f4e92b00f28906839f26166bd1fe7dc47a57fff81e61e747c206cbb6d1eaa7256971e6bce59802d01db4d90ae08c0c6380  dispatch.sr.ht-0.14.8.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.14.8.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 2cb15282905d56d6b17f5aed032b15d98da64c9ec315db4650e0729398a9ea4d9704a57e3b7f55e1c5381914f7fe5e85b58e4e88e9e68fcab89ef1763e377278  dispatch.sr.ht.confd
 9e96f369c042faba2130e20861e3f6e458c0d986961bff284040f76832012c488836aef870e4e7ba238f8443659953a0edfc0f1c10878ca73d27fe3756766955  dispatch.sr.ht.initd"
diff --git a/sr.ht/dispatch.sr.ht/dispatch.sr.ht.confd b/sr.ht/dispatch.sr.ht/dispatch.sr.ht.confd
index 38b98a6..c55080a 100644
--- a/sr.ht/dispatch.sr.ht/dispatch.sr.ht.confd
+++ b/sr.ht/dispatch.sr.ht/dispatch.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # DISPATCH_BIND=127.0.0.1:5005
 
+# Gunicorn configuration file
+# DISPATCH_GUNICORN_CONF=/etc/sr.ht/dispatch.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # DISPATCH_ARGS=
diff --git a/sr.ht/dispatch.sr.ht/dispatch.sr.ht.initd b/sr.ht/dispatch.sr.ht/dispatch.sr.ht.initd
index 018b519..ff19542 100644
--- a/sr.ht/dispatch.sr.ht/dispatch.sr.ht.initd
+++ b/sr.ht/dispatch.sr.ht/dispatch.sr.ht.initd
@@ -4,11 +4,13 @@ description="dispatch.sr.ht service"
 supervisor=supervise-daemon
 DISPATCH_USER=${DISPATCH_USER:-dispatch}
 DISPATCH_BIND=${DISPATCH_BIND:-127.0.0.1:5005}
+DISPATCH_GUNICORN_CONF=${DISPATCH_GUNICORN_CONF:-/etc/sr.ht/dispatch.sr.ht.gunicorn.conf.py}
 DISPATCH_ARGS=${DISPATCH_ARGS:-}
 LOGS=/var/log/dispatch.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/dispatch.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="dispatchsrht.app:app -b $DISPATCH_BIND $DISPATCH_ARGS"
+command_args="dispatchsrht.app:app -b $DISPATCH_BIND -c $DISPATCH_GUNICORN_CONF $DISPATCH_ARGS"
 command_user="$DISPATCH_USER:$DISPATCH_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/git.sr.ht/APKBUILD b/sr.ht/git.sr.ht/APKBUILD
index 13ce2ac..7fa5e97 100644
--- a/sr.ht/git.sr.ht/APKBUILD
+++ b/sr.ht/git.sr.ht/APKBUILD
@@ -18,6 +18,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx:noarch"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	git.sr.ht.initd
 	git.sr.ht.confd
 	git.sr.ht-api.initd
@@ -58,6 +59,8 @@ package() {
 		"$pkgdir"/etc/init.d/git.sr.ht-webhooks
 	install -Dm644 "$srcdir"/git.sr.ht-webhooks.confd \
 		"$pkgdir"/etc/conf.d/git.sr.ht-webhooks
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/git.sr.ht.gunicorn.conf.py
 
 	cd gitsrht-dispatch
 	install -Dm755 gitsrht-dispatch "$pkgdir"/usr/bin/gitsrht-dispatch
@@ -80,6 +83,7 @@ _nginx() {
 
 sha512sums="48777ef0f019c481a18a22cf6f2ef019a73baba53eda4314315084727aa3c6bef8d78ee115746dd57ca507909ef52cf0ee498035a135bfc9bbd2641ab14d42f1  git.sr.ht-0.60.5.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.60.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 3debc75949507607a8572c2164b3785388cac46419a8d12cea5dc060a5effcb89913f6a873975dde732ea0749e899542055196979c44cb2d68ba226b96f1fd6c  git.sr.ht.initd
 721b0f736c28ece353707ae317a71f2cbf20b02e08f4a3d481a05bf798de4af4d1b7ad2c0fd774581e1c04f2771e139be9f784edc7d433e3a5aecfb7e9a56c78  git.sr.ht.confd
 370a9f710704d7dfe88632f0ae2b7d2b406621322cab1f87f4f4c3984c741fba616f9c2a806d83e79250dc58aba89161a2db8ca424794dbd2cacbffb6e1a9adb  git.sr.ht-api.initd
diff --git a/sr.ht/git.sr.ht/git.sr.ht.confd b/sr.ht/git.sr.ht/git.sr.ht.confd
index 6389681..966e2eb 100644
--- a/sr.ht/git.sr.ht/git.sr.ht.confd
+++ b/sr.ht/git.sr.ht/git.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # GIT_BIND=127.0.0.1:5001
 
+# Gunicorn configuration file
+# GIT_GUNICORN_CONF=/etc/sr.ht/git.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # GIT_ARGS=
diff --git a/sr.ht/git.sr.ht/git.sr.ht.initd b/sr.ht/git.sr.ht/git.sr.ht.initd
index 158c23f..e666fc4 100755
--- a/sr.ht/git.sr.ht/git.sr.ht.initd
+++ b/sr.ht/git.sr.ht/git.sr.ht.initd
@@ -4,11 +4,13 @@ description="git.sr.ht service"
 supervisor=supervise-daemon
 GIT_USER=${GIT_USER:-git}
 GIT_BIND=${GIT_BIND:-127.0.0.1:5001}
+GIT_GUNICORN_CONF=${GIT_GUNICORN_CONF:-/etc/sr.ht/git.sr.ht.gunicorn.conf.py}
 GIT_ARGS=${GIT_ARGS:-}
 LOGS=/var/log/git.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/git.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="gitsrht.app:app -b $GIT_BIND $GIT_ARGS"
+command_args="gitsrht.app:app -b $GIT_BIND  -c $GIT_GUNICORN_CONF $GIT_ARGS"
 command_user="$GIT_USER:$GIT_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/hg.sr.ht/APKBUILD b/sr.ht/hg.sr.ht/APKBUILD
index 4000136..c8a11f1 100644
--- a/sr.ht/hg.sr.ht/APKBUILD
+++ b/sr.ht/hg.sr.ht/APKBUILD
@@ -18,6 +18,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx:noarch"
 source="
 	$pkgname-$pkgver.tar.gz::https://hg.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	hg.sr.ht.initd
 	hg.sr.ht.confd
 	hg.sr.ht-webhooks.initd
@@ -44,6 +45,8 @@ package() {
 		"$pkgdir"/etc/init.d/hg.sr.ht-webhooks
 	install -Dm644 "$srcdir"/hg.sr.ht-webhooks.confd \
 		"$pkgdir"/etc/conf.d/hg.sr.ht-webhooks
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/hg.sr.ht.gunicorn.conf.py
 	cd hgsrht-keys
 	install -Dm755 hgsrht-keys "$pkgdir"/usr/bin/hgsrht-keys
 	cd ../hgsrht/hgrcs
@@ -60,6 +63,7 @@ _nginx() {
 
 sha512sums="19c646175dde101e44007fc2526a3e741d6d71c52ca30f870f05255847919d5cf4ec8663d91721a7f47e1478a75968499c6f563669b3f7985b8bb809f223c319  hg.sr.ht-0.26.16.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.26.16.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 38923f14ca3cedf4004447ef5ab75d5699a858efdc22866f1da10a82c3a938227c03380b84fae719b84b4751f03fec55be922d950a155e09c7e8e41ff71b3c6b  hg.sr.ht.initd
 2c3f1776f8bb6bb42f0d240b28561d0bfb1b4638cad169cd5162f9c227028d0d256fd510f8a47c9c0ec111d11e9f54c293fef6c3e3d99d925dcd170294f44472  hg.sr.ht.confd
 93f25762da77462c8167ae53ba37ab4f9982c7f3c2d03dde445f0578758b808987c4781912a0fa5b4a4e25ba50c9d27477dfea8e319908ddc124dc836aefd2d6  hg.sr.ht-webhooks.initd
diff --git a/sr.ht/hg.sr.ht/hg.sr.ht.confd b/sr.ht/hg.sr.ht/hg.sr.ht.confd
index 85f57d2..f30338d 100644
--- a/sr.ht/hg.sr.ht/hg.sr.ht.confd
+++ b/sr.ht/hg.sr.ht/hg.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # HG_BIND=127.0.0.1:5010
 
+# Gunicorn configuration file
+# HG_GUNICORN_CONF=/etc/sr.ht/hg.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # HG_ARGS=
diff --git a/sr.ht/hg.sr.ht/hg.sr.ht.initd b/sr.ht/hg.sr.ht/hg.sr.ht.initd
index 5c96b9d..497c112 100755
--- a/sr.ht/hg.sr.ht/hg.sr.ht.initd
+++ b/sr.ht/hg.sr.ht/hg.sr.ht.initd
@@ -4,11 +4,13 @@ description="hg.sr.ht service"
 supervisor=supervise-daemon
 HG_USER=${HG_USER:-hg}
 HG_BIND=${HG_BIND:-127.0.0.1:5010}
+HG_GUNICORN_CONF=${HG_GUNICORN_CONF:-/etc/sr.ht/hg.sr.ht.gunicorn.conf.py}
 HG_ARGS=${HG_ARGS:-}
 LOGS=/var/log/hg.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/hg.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="hgsrht.app:app -b $HG_BIND $HG_ARGS"
+command_args="hgsrht.app:app -b $HG_BIND -c $HG_GUNICORN_CONF $HG_ARGS"
 command_user="$HG_USER:$HG_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/hub.sr.ht/APKBUILD b/sr.ht/hub.sr.ht/APKBUILD
index 9d50645..484680f 100644
--- a/sr.ht/hub.sr.ht/APKBUILD
+++ b/sr.ht/hub.sr.ht/APKBUILD
@@ -15,6 +15,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx:noarch"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	hub.sr.ht.initd
 	hub.sr.ht.confd
 "
@@ -33,6 +34,8 @@ package() {
 		"$pkgdir"/etc/init.d/hub.sr.ht
 	install -Dm644 "$srcdir"/hub.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/hub.sr.ht
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/hub.sr.ht.gunicorn.conf.py
 }
 
 _nginx() {
@@ -44,5 +47,6 @@ _nginx() {
 
 sha512sums="cf7ce2df7a21b18182009c2011fa24c1672e5ed8fafb04bbfdb7685fefb3bbe35672d77b6e6eb78a7b6adc7898a93937eb47d3fe7d231fcb4388a5207d832e0b  hub.sr.ht-0.10.5.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.10.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 b120bdb3cc74a124259babf8b3f271fa74fbd4fac0dfd1a2a88b7e2311473f8509936019926d6770ca07b3cdd7cf37627c8f37a8f97790da56d2b33b2bf39dca  hub.sr.ht.initd
 b7c6210b6893918ad655a709b39469607f3cff8d193948c1a74c6c364e9fb9dc3ed03d5ccb682b3b4581622988242f925977096a595e010ba4ef3afea0b6100e  hub.sr.ht.confd"
diff --git a/sr.ht/hub.sr.ht/hub.sr.ht.confd b/sr.ht/hub.sr.ht/hub.sr.ht.confd
index 1366344..a2e0dfd 100644
--- a/sr.ht/hub.sr.ht/hub.sr.ht.confd
+++ b/sr.ht/hub.sr.ht/hub.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # HUB_BIND=127.0.0.1:5014
 
+# Gunicorn configuration file
+# HUB_GUNICORN_CONF=/etc/sr.ht/hub.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # HUB_ARGS=
diff --git a/sr.ht/hub.sr.ht/hub.sr.ht.initd b/sr.ht/hub.sr.ht/hub.sr.ht.initd
index 000ee24..b1fdb78 100755
--- a/sr.ht/hub.sr.ht/hub.sr.ht.initd
+++ b/sr.ht/hub.sr.ht/hub.sr.ht.initd
@@ -4,11 +4,13 @@ description="hub.sr.ht service"
 supervisor=supervise-daemon
 HUB_USER=${HUB_USER:-hub}
 HUB_BIND=${HUB_BIND:-127.0.0.1:5014}
+HUB_GUNICORN_CONF=${HUB_GUNICORN_CONF:-/etc/sr.ht/hub.sr.ht.gunicorn.conf.py}
 HUB_ARGS=${HUB_ARGS:-}
 LOGS=/var/log/hub.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/hub.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="hubsrht.app:app -b $HUB_BIND $HUB_ARGS"
+command_args="hubsrht.app:app -b $HUB_BIND -c $HUB_GUNICORN_CONF $HUB_ARGS"
 command_user="$HUB_USER:$HUB_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/lists.sr.ht/APKBUILD b/sr.ht/lists.sr.ht/APKBUILD
index 45f209c..18df2a8 100644
--- a/sr.ht/lists.sr.ht/APKBUILD
+++ b/sr.ht/lists.sr.ht/APKBUILD
@@ -21,6 +21,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	lists.sr.ht.initd
 	lists.sr.ht.confd
 	lists.sr.ht-process.initd
@@ -57,6 +58,8 @@ package() {
 		"$pkgdir"/etc/init.d/lists.sr.ht-webhooks
 	install -Dm644 "$srcdir"/lists.sr.ht-webhooks.confd \
 		"$pkgdir"/etc/conf.d/lists.sr.ht-webhooks
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/lists.sr.ht.gunicorn.conf.py
 }
 
 _nginx() {
@@ -68,6 +71,7 @@ _nginx() {
 
 sha512sums="e79b073e9a51385120f7cc0ba5af586d9e550b6de50fe0e4228ae8e782a17d41f98482c202ae89cc3aae1e3a85e5811d5e1c9bcb16cf00ee5a8fbda1657fa177  lists.sr.ht-0.45.5.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.45.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 50817a0e37f99f3620e539f539492567d1a69f12bfafd69c6f33eb79ba0822ee8e84bdd6c544e548f2dd40fe941e91272e22ee16948d571832029a4122bfb8e6  lists.sr.ht.initd
 66d39dc5d1341c6b249035c80b90fe10c602eafc162eb084b485ad68b435378b846eda0658573d7190a4137e045f9ed87989caefbc019c6d4eac61e76523f207  lists.sr.ht.confd
 b70ef07ee3247b33167111e301804d69416e8ebe020ea28587a4fd7d8fa0a81c7228309a5aa344d83f32578a7a66466f9484eac5332cfe264a538178645fd202  lists.sr.ht-process.initd
diff --git a/sr.ht/lists.sr.ht/lists.sr.ht.confd b/sr.ht/lists.sr.ht/lists.sr.ht.confd
index 929ee94..5be9a6d 100644
--- a/sr.ht/lists.sr.ht/lists.sr.ht.confd
+++ b/sr.ht/lists.sr.ht/lists.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # LISTS_BIND=127.0.0.1:5006
 
+# Gunicorn configuration file
+# LISTS_GUNICORN_CONF=/etc/sr.ht/lists.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # LISTS_ARGS=
diff --git a/sr.ht/lists.sr.ht/lists.sr.ht.initd b/sr.ht/lists.sr.ht/lists.sr.ht.initd
index e241f1f..04574f4 100755
--- a/sr.ht/lists.sr.ht/lists.sr.ht.initd
+++ b/sr.ht/lists.sr.ht/lists.sr.ht.initd
@@ -4,11 +4,13 @@ description="lists.sr.ht service"
 supervisor=supervise-daemon
 LISTS_USER=${LISTS_USER:-lists}
 LISTS_BIND=${LISTS_BIND:-127.0.0.1:5006}
+LISTS_GUNICORN_CONF=${LISTS_GUNICORN_CONF:-/etc/sr.ht/lists.sr.ht.gunicorn.conf.py}
 LISTS_ARGS=${LISTS_ARGS:-}
 LOGS=/var/log/lists.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/lists.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="listssrht.app:app -b $LISTS_BIND $LISTS_ARGS"
+command_args="listssrht.app:app -b $LISTS_BIND -c $LISTS_GUNICORN_CONF $LISTS_ARGS"
 command_user="$LISTS_USER:$LISTS_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/man.sr.ht/APKBUILD b/sr.ht/man.sr.ht/APKBUILD
index 4d22d3d..e724ac3 100644
--- a/sr.ht/man.sr.ht/APKBUILD
+++ b/sr.ht/man.sr.ht/APKBUILD
@@ -19,6 +19,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	man.sr.ht.initd
 	man.sr.ht.confd
 "
@@ -36,6 +37,8 @@ package() {
 		"$pkgdir"/etc/init.d/man.sr.ht
 	install -Dm644 "$srcdir"/man.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/man.sr.ht
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/man.sr.ht.gunicorn.conf.py
 }
 
 _nginx() {
@@ -47,5 +50,6 @@ _nginx() {
 
 sha512sums="befd10ddce4b6b421ff59e40d8d010f54923131e812cc713a6b9c0a80f439e7ea03455cbfd4645d9f1f79c00d00becd391ede911be61af1f78884962cb9df016  man.sr.ht-0.15.0.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.15.0.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 ca32992f0778f6edf227de4520dd13fe0c3c4e4dd5be1043a5e5fb66f49392813a5bd0502e33b7c3f352cdcb12edc84e20faa2e376d33fe937a6b756e6e90033  man.sr.ht.initd
 e8e3b1f8e3e6a132692774d141e79b9334714130371523bf43edadba0a580ce6003e7a7f5b23fb769d78c5951f6ac1f4097232c2764ed5988366ad80d1a85df7  man.sr.ht.confd"
diff --git a/sr.ht/man.sr.ht/man.sr.ht.confd b/sr.ht/man.sr.ht/man.sr.ht.confd
index be760e4..bd6da4c 100644
--- a/sr.ht/man.sr.ht/man.sr.ht.confd
+++ b/sr.ht/man.sr.ht/man.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # MAN_BIND=127.0.0.1:5004
 
+# Gunicorn configuration file
+# MAN_GUNICORN_CONF=/etc/sr.ht/man.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # MAN_ARGS=
diff --git a/sr.ht/man.sr.ht/man.sr.ht.initd b/sr.ht/man.sr.ht/man.sr.ht.initd
index c2804f2..00d5053 100755
--- a/sr.ht/man.sr.ht/man.sr.ht.initd
+++ b/sr.ht/man.sr.ht/man.sr.ht.initd
@@ -4,11 +4,13 @@ description="man.sr.ht service"
 supervisor=supervise-daemon
 MAN_USER=${MAN_USER:-man}
 MAN_BIND=${MAN_BIND:-127.0.0.1:5004}
+MAN_GUNICORN_CONF=${MAN_GUNICORN_CONF:-/etc/sr.ht/man.sr.ht.gunicorn.conf.py}
 MAN_ARGS=${MAN_ARGS:-}
 LOGS=/var/log/man.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/man.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="mansrht.app:app -b $MAN_BIND $MAN_ARGS"
+command_args="mansrht.app:app -b $MAN_BIND -c $MAN_GUNICORN_CONF $MAN_ARGS"
 command_user="$MAN_USER:$MAN_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/meta.sr.ht/APKBUILD b/sr.ht/meta.sr.ht/APKBUILD
index dc53ba3..7e089d7 100644
--- a/sr.ht/meta.sr.ht/APKBUILD
+++ b/sr.ht/meta.sr.ht/APKBUILD
@@ -25,6 +25,7 @@ subpackages="$pkgname-openrc $pkgname-billing:_billing:noarch $pkgname-nginx:_ng
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	meta.sr.ht.initd
 	meta.sr.ht.confd
 	meta.sr.ht-api.initd
@@ -57,6 +58,8 @@ package() {
 		"$pkgdir"/etc/init.d/meta.sr.ht-webhooks
 	install -Dm644 "$srcdir"/meta.sr.ht-webhooks.confd \
 		"$pkgdir"/etc/conf.d/meta.sr.ht-webhooks
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/meta.sr.ht.gunicorn.conf.py
 
 	cd api
 	install -Dm755 metasrht-api "$pkgdir"/usr/bin/metasrht-api
@@ -78,6 +81,7 @@ _nginx() {
 
 sha512sums="52f5b3e8d563ee6b3ae677ee5fc0b95e54d6e65b275c40215412482299db35bf3ab57c1b389ec4add8603782b5461d476f10a36944aef3e8b0b13b943a9d37dd  meta.sr.ht-0.46.5.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.46.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 c1782e12caaeb11db5eab299dbee1510ee1a697840c5b5ecd46aec23f7a16acc6e60fa0b7959a1cbcbc2614183b4e988f9eb905da475e418fd4b13fd53c71e2a  meta.sr.ht.initd
 7e29f31839febf557d484f34de800e89be39d7a288cc5ea0b4d7fbdf13a722564d3795fdf0da53c5e2f9fb79f3e9b57508b569aa99762e35c4f9ac50f7dff59e  meta.sr.ht.confd
 8377026251395fa74980a6733a6715c5dcfa6b893ad846d556479d3170605ba7cbe5dcc1c482f90a20e0b6332732cba9480d198dfcc9d73d2d6e338e5276bc65  meta.sr.ht-api.initd
diff --git a/sr.ht/meta.sr.ht/meta.sr.ht.confd b/sr.ht/meta.sr.ht/meta.sr.ht.confd
index b59a4db..db6a42f 100644
--- a/sr.ht/meta.sr.ht/meta.sr.ht.confd
+++ b/sr.ht/meta.sr.ht/meta.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # META_BIND=127.0.0.1:5001
 
+# Gunicorn configuration file
+# META_GUNICORN_CONF=/etc/sr.ht/meta.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # META_ARGS=
diff --git a/sr.ht/meta.sr.ht/meta.sr.ht.initd b/sr.ht/meta.sr.ht/meta.sr.ht.initd
index f8e9a0c..50287a6 100755
--- a/sr.ht/meta.sr.ht/meta.sr.ht.initd
+++ b/sr.ht/meta.sr.ht/meta.sr.ht.initd
@@ -4,11 +4,13 @@ description="meta.sr.ht service"
 supervisor=supervise-daemon
 META_USER=${META_USER:-meta}
 META_BIND=${META_BIND:-127.0.0.1:5000}
+META_GUNICORN_CONF=${META_GUNICORN_CONF:-/etc/sr.ht/meta.sr.ht.gunicorn.conf.py}
 META_ARGS=${META_ARGS:-}
 LOGS=/var/log/meta.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/meta.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="metasrht.app:app -b $META_BIND $META_ARGS"
+command_args="metasrht.app:app -b $META_BIND -c $META_GUNICORN_CONF $META_ARGS"
 command_user="$META_USER:$META_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/paste.sr.ht/APKBUILD b/sr.ht/paste.sr.ht/APKBUILD
index 3120f42..d8550dd 100644
--- a/sr.ht/paste.sr.ht/APKBUILD
+++ b/sr.ht/paste.sr.ht/APKBUILD
@@ -16,6 +16,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	paste.sr.ht.initd
 	paste.sr.ht.confd
 "
@@ -33,6 +34,8 @@ package() {
 		"$pkgdir"/etc/init.d/paste.sr.ht
 	install -Dm644 "$srcdir"/paste.sr.ht.confd \
 		"$pkgdir"/etc/conf.d/paste.sr.ht
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/paste.sr.ht.gunicorn.conf.py
 }
 
 _nginx() {
@@ -44,5 +47,6 @@ _nginx() {
 
 sha512sums="4a401f4ca9a4e43e2dae4925207295e2dd5031a7e2c4773998ea5fd31052f3c53d28fde30610f67d1da6c1906067fae72542b458bf48b57d647da3fb8e39e255  paste.sr.ht-0.11.0.tar.gz
 ef662f839e59bba208210737bf193b230e8e6accf1cda343f91d013b7922f5923f8468d0f18e16376cf6cb6b6c4f2e6a361f7f45fb1da9cc6e42ad045b0e25fc  sr.ht-nginx-0.11.0.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 ecbbfe19bbb60bb7724210bb38601dcf64cbd24056fb59d22ac4539082b6e30ac4d80b59d1e3ba58ac232df291304746b6deb49836c0a329233c3531baa33bda  paste.sr.ht.initd
 8b4f89e5d8fd96b6e898f81c7d5f516715285a4cb871a6bb31bcea059eb40aff5019039a973815aacd22eb9957bb02b2835a8e9c9aac3ab83649145c6636a388  paste.sr.ht.confd"
diff --git a/sr.ht/paste.sr.ht/paste.sr.ht.confd b/sr.ht/paste.sr.ht/paste.sr.ht.confd
index b4a9d43..0d71f0e 100644
--- a/sr.ht/paste.sr.ht/paste.sr.ht.confd
+++ b/sr.ht/paste.sr.ht/paste.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # PASTE_BIND=127.0.0.1:5011
 
+# Gunicorn configuration file
+# PASTE_GUNICORN_CONF=/etc/sr.ht/paste.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # PASTE_ARGS=
diff --git a/sr.ht/paste.sr.ht/paste.sr.ht.initd b/sr.ht/paste.sr.ht/paste.sr.ht.initd
index 724b6c5..5a8da08 100755
--- a/sr.ht/paste.sr.ht/paste.sr.ht.initd
+++ b/sr.ht/paste.sr.ht/paste.sr.ht.initd
@@ -4,11 +4,13 @@ description="paste.sr.ht service"
 supervisor=supervise-daemon
 PASTE_USER=${PASTE_USER:-paste}
 PASTE_BIND=${PASTE_BIND:-127.0.0.1:5011}
+PASTE_GUNICORN_CONF=${PASTE_GUNICORN_CONF:-/etc/sr.ht/paste.sr.ht.gunicorn.conf.py}
 PASTE_ARGS=${PASTE_ARGS:-}
 LOGS=/var/log/paste.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/paste.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="pastesrht.app:app -b $PASTE_BIND $PASTE_ARGS"
+command_args="pastesrht.app:app -b $PASTE_BIND  -c $PASTE_GUNICORN_CONF $PASTE_ARGS"
 command_user="$PASTE_USER:$PASTE_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
diff --git a/sr.ht/todo.sr.ht/APKBUILD b/sr.ht/todo.sr.ht/APKBUILD
index 38d1a36..847b047 100644
--- a/sr.ht/todo.sr.ht/APKBUILD
+++ b/sr.ht/todo.sr.ht/APKBUILD
@@ -17,6 +17,7 @@ subpackages="$pkgname-openrc $pkgname-nginx:_nginx"
 source="
 	$pkgname-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/$pkgname/archive/$pkgver.tar.gz
 	sr.ht-nginx-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/sr.ht-nginx/archive/master.tar.gz
+	core.sr.ht-$pkgver.tar.gz::https://git.sr.ht/~sircmpwn/core.sr.ht/archive/master.tar.gz
 	todo.sr.ht.initd
 	todo.sr.ht.confd
 	todo.sr.ht-lmtp.initd
@@ -58,6 +59,8 @@ package() {
 		"$pkgdir"/etc/init.d/todo.sr.ht-api
 	install -Dm644 "$srcdir"/todo.sr.ht-api.confd \
 		"$pkgdir"/etc/conf.d/todo.sr.ht-api
+	install -Dm644 "$srcfir"/core.sr.ht-master/contrib/gunicorn.conf.py \
+		"$pkgdir"/etc/sr.ht/todo.sr.ht.gunicorn.conf.py
 }
 
 _nginx() {
@@ -69,6 +72,7 @@ _nginx() {
 
 sha512sums="01aafd3039c8726ab30cca60a1e1c4e6b2558d27fe2c0f8ba06b1806b6edb9be51be281f49d26cfd2e327c58ccc40bc077c4dde8be6f6519ac01c34b6661d11a  todo.sr.ht-0.61.5.tar.gz
 8b6b201b820d5639762d4302f2ef8b6555010991fe14bf6113f20216815ba368f691e82af3818b223e08a37312d68df115f4e76fb73b193ca08a7e0e63ca1eb5  sr.ht-nginx-0.61.5.tar.gz
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000  core.sr.ht-0.62.5.tar.gz
 9f0c7284e7dd21156efdbad8074651c643ed6eb8aaca70d44fdfc652726930f8f1036d7f5d55f64bfb09e220e9c4d8e17b0abb54793daae44716deea6d122145  todo.sr.ht.initd
 a4ab31da9633228e14a3baedaa0a257100d2758d5feaeb655a1647fd5a08b5a8a2c7af560d3d3af0956b66e6fbb8cba1fc7c46929eb78c45d81e881ef6d6c6c1  todo.sr.ht.confd
 c4ac342b5fa506c1323d9c55f36b800e16cb9afdecc32f94bf7261c8fa2710db839b84137d24f3e43ac28e036cf21f63c381a650661e722e416c61a6cf44c938  todo.sr.ht-lmtp.initd
diff --git a/sr.ht/todo.sr.ht/todo.sr.ht.confd b/sr.ht/todo.sr.ht/todo.sr.ht.confd
index 105e7d1..5da096b 100644
--- a/sr.ht/todo.sr.ht/todo.sr.ht.confd
+++ b/sr.ht/todo.sr.ht/todo.sr.ht.confd
@@ -4,5 +4,8 @@
 # Bind the web service to this address:
 # TODO_BIND=127.0.0.1:5003
 
+# Gunicorn configuration file
+# TODO_GUNICORN_CONF=/etc/sr.ht/todo.sr.ht.gunicorn.conf.py
+
 # Extra arguments to pass to Gunicorn
 # TODO_ARGS=
diff --git a/sr.ht/todo.sr.ht/todo.sr.ht.initd b/sr.ht/todo.sr.ht/todo.sr.ht.initd
index b333a8e..4c618ed 100755
--- a/sr.ht/todo.sr.ht/todo.sr.ht.initd
+++ b/sr.ht/todo.sr.ht/todo.sr.ht.initd
@@ -4,11 +4,13 @@ description="todo.sr.ht service"
 supervisor=supervise-daemon
 TODO_USER=${TODO_USER:-todo}
 TODO_BIND=${TODO_BIND:-127.0.0.1:5003}
+TODO_GUNICORN_CONF=${TODO_GUNICORN_CONF:-/etc/sr.ht/todo.sr.ht.gunicorn.conf.py}
 TODO_ARGS=${TODO_ARGS:-}
 LOGS=/var/log/todo.sr.ht.log
-supervise_daemon_args="-1 $LOGS -2 $LOGS"
+prometheus_multiproc_dir=/run/todo.sr.ht/metrics
+supervise_daemon_args="-1 $LOGS -2 $LOGS -e prometheus_multiproc_dir=$prometheus_multiproc_dir"
 command="/usr/bin/gunicorn"
-command_args="todosrht.app:app -b $TODO_BIND $TODO_ARGS"
+command_args="todosrht.app:app -b $TODO_BIND -c $TODO_GUNICORN_CONF $TODO_ARGS"
 command_user="$TODO_USER:$TODO_USER"
 pidfile="/run/${RC_SVCNAME}.pid"
 
-- 
2.25.1

Drew DeVault

Details

Message ID: <CAIC04LXVMHR.2JNFSHEF79XDV@taiga>
In-Reply-To: <20210402093435.158778-1-me@ignaskiela.eu> (view parent)
DKIM signature: fail

Download raw message

8 days ago

DKIM signature: fail

I would prefer to source the gunicorn.conf.py file from dropping it
into these package directories, rather than adding it to core.sr.ht and
adding core.sr.ht's master tarball as a source for every package.

Also, this change is pretty complex, so I would appreciate it if you did
take the time to set up an Alpine environment and test is thorougly.

~sircmpwn/sr.ht-packages

[RFC PATCH sr.ht-apkbuilds] *.sr.ht: Enable prometheus multiprocessing mode