Merge pull request 'flora-6: pub.solar webfinger should redirect to mastodon, too' (#222) from infra-fix-mastodon-webfinger into infra
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #222 Reviewed-by: b12f <hello@benjaminbaedorf.eu>
This commit is contained in:
commit
ad5e0e74d5
|
@ -25,6 +25,9 @@
|
|||
output discard
|
||||
'';
|
||||
extraConfig = ''
|
||||
# Named matcher, used below for Mastodon webfinger
|
||||
@query query resource=*
|
||||
|
||||
# PubSolarOS images
|
||||
handle /os/download/* {
|
||||
root * /data/srv/www
|
||||
|
@ -36,8 +39,12 @@
|
|||
redir https://mastodon.pub.solar{uri}
|
||||
}
|
||||
|
||||
# Tailscale OIDC requirement
|
||||
# Tailscale OIDC webfinger requirement plus Mastodon webfinger redirect
|
||||
handle /.well-known/webfinger {
|
||||
# Redirect requests that match /.well-known/webfinger?resource=* to Mastodon
|
||||
handle @query {
|
||||
redir https://mastodon.pub.solar{uri}
|
||||
}
|
||||
respond 200 {
|
||||
body `{
|
||||
"subject": "acct:admins@pub.solar",
|
||||
|
|
Loading…
Reference in a new issue