xengi/infra
Watch
0
1
Fork
You've already forked infra
 0
Code Pull requests Activity Actions

Merge branch 'main' of ssh://git.berlin.ccc.de/xengi/infra
Some checks failed
Test Nix flake / Test nix flake (push) Has been cancelled
Details

Browse source
This commit is contained in:
XenGi 2026-10-20 20:34:02 +02:00
commit cd82a0facd
Signed by: xengi
SSH key fingerprint: SHA256:dM+fLZGsDvyv6kunjE8bGduL24VsCFB4LEOSdmRHdG0
5 changed files with 27 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/forgejo-runner/forgejo-runner.nix
View file

@ -45,7 +45,7 @@
};
container = {
enable_ipv6 = true;
network = "forgejo";
network = "default";
privileged = true;
force_pull = true;
docker_host = "unix:///run/podman/podman.sock";

23
hosts/www/nginx.nix
View file

@ -2,6 +2,12 @@
let
# TODO: mkVHost
aliasDir = url: path: {
"${url}" = {
return = "301 ${url}/";
};
"${url}/".alias = "${path}/";
};
in
{
imports = [
@ -42,13 +48,6 @@ in
index = "index.html";
tryFiles = "$uri $uri/ $uri.html =404";
};
"/twentyyears/".alias = "/srv/http/twentyyears/";
"/thirtytwoyears/".alias = "/srv/http/thirtytwoyears/";
# RFC8805
"/noc/".alias = "/srv/http/noc/";
"/static/".alias = "/srv/http/static/";
# RFC8805 new location
"/.well-known/loc/".alias = "/srv/http/noc/";
"= /.well-known/security.txt" = {
alias = "/srv/http/security.txt";
extraConfig = ''
@ -90,7 +89,15 @@ in
default_type text/calendar;
'';
};
};
}
// aliasDir "/twentyyears" "/srv/http/twentyyears"
// aliasDir "/thirtytwoyears" "/srv/http/thirtytwoyears"
// aliasDir "/kik" "/srv/http/kik"
# RFC8805
// aliasDir "/noc" "/srv/http/noc"
// aliasDir "/static" "/srv/http/static"
# RFC8805 new location
// aliasDir "/.well-known/loc" "/srv/http/noc";
};
"staging.${config.networking.domain}" = {
quic = true;