Merge branch 'next' into 'next'

fix nix readme to work with ipv6

See merge request famedly/conduit!475
This commit is contained in:
Timo Kösters 2023-05-26 12:30:02 +00:00
commit 0280fa5793

View file

@ -118,10 +118,19 @@ in
ssl = true; ssl = true;
} }
{ {
addr = "[::]";
port = 443;
ssl = true;
} {
addr = "0.0.0.0"; addr = "0.0.0.0";
port = 8448; port = 8448;
ssl = true; ssl = true;
} }
{
addr = "[::]";
port = 8448;
ssl = true;
}
]; ];
locations."/_matrix/" = { locations."/_matrix/" = {