pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

infra: pull in gitea GPG fix from nixos-unstable #175

Merged
teutat3s merged 3 commits from bump/infra-flake-lock into infra 2023-03-05 14:30:07 +00:00
Conversation 0 Commits 3 Files changed 2 +36 -36
1 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit df79b8a3c9 - Show all commits

72
hosts/flora-6/caddy.nix
View file

@ -21,45 +21,45 @@
output discard output discard
''; '';
extraConfig = '' extraConfig = ''
# PubSolarOS images # PubSolarOS images
handle /os/download/* { handle /os/download/* {
root * /srv/www root * /srv/www
file_server /os/download/* browse file_server /os/download/* browse
} }
# serve base domain pub.solar for mastodon.pub.solar # serve base domain pub.solar for mastodon.pub.solar
# https://masto.host/mastodon-usernames-different-from-the-domain-used-for-installation/ # https://masto.host/mastodon-usernames-different-from-the-domain-used-for-installation/
handle /.well-known/host-meta { handle /.well-known/host-meta {
redir https://mastodon.pub.solar{uri} redir https://mastodon.pub.solar{uri}
} }
# Tailscale OIDC requirement # Tailscale OIDC requirement
handle /.well-known/webfinger { handle /.well-known/webfinger {
respond 200 { respond 200 {
body `{ body `{
"subject": "acct:admins@pub.solar", "subject": "acct:admins@pub.solar",
"links": [ "links": [
{ {
"rel": "http://openid.net/specs/connect/1.0/issuer", "rel": "http://openid.net/specs/connect/1.0/issuer",
"href": "https://auth.pub.solar/realms/pub.solar" "href": "https://auth.pub.solar/realms/pub.solar"
} }
] ]
}` }`
} }
} }
# redirect to statutes # redirect to statutes
redir /satzung https://cloud.pub.solar/s/2tRCP9aZFCiWxQy temporary redir /satzung https://cloud.pub.solar/s/2tRCP9aZFCiWxQy temporary
# pub.solar website # pub.solar website
handle { handle {
root * /srv/www/pub.solar root * /srv/www/pub.solar
try_files {path}.html {path} try_files {path}.html {path}
file_server file_server
} }
# minimal error handling, respond with status code and text # minimal error handling, respond with status code and text
handle_errors { handle_errors {
respond "{http.error.status_code} {http.error.status_text}" respond "{http.error.status_code} {http.error.status_text}"
} }
''; '';
}; };
"www.pub.solar" = { "www.pub.solar" = {