Merge branch 'next' into 'next'

fix nix readme to work with ipv6 See merge request famedly/conduit!475
3 years ago · 0280fa5793
1 changed files with 9 additions and 0 deletions
--- a/nix/README.md
+++ b/nix/README.md
@ -118,10 +118,19 @@ in
            ssl = true;
          }
          {
+            addr = "[::]";
+            port = 443;
+            ssl = true;
+          }          {
            addr = "0.0.0.0";
            port = 8448;
            ssl = true;
          }
+          {
+            addr = "[::]";
+            port = 8448;
+            ssl = true;
+          }
        ];

        locations."/_matrix/" = {