diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix index a8ab99a..9c620fc 100644 --- a/system-modules/nx2site/proxy.nix +++ b/system-modules/nx2site/proxy.nix @@ -90,24 +90,22 @@ default = true; listen = dl; locations = { - "/" = { - extraConfig = '' - index index.html; - ''; - }; - "~^(/ba)$" = { return = "301 /BA.pdf"; }; - "/.well-known/matrix/client" = { return = "502"; }; - "/.well-known/matrix/server" = { return = "502"; }; - "/phone" = { return = "301 /cards/phone"; }; - "/about-me" = { return = "301 /slides/about-me"; }; - "/about-this-site" = { return = "301 /slides/about-this-site"; }; - "/gpg" = { return = "301 /cards/gpg"; }; - "/contact" = { return = "301 /cards/contact"; }; + "/".extraConfig = '' + index index.html; + ''; + "~ ^(/.well-known/matrix/client)$".return = "502"; + "~ ^(/.well-known/matrix/server)$".return = "502"; + "~ ^(/phone)$".return = "301 /cards/phone"; + "~ ^(/about-me)$".return = "301 /slides/about-me"; + "~ ^(/about-this-site)$".return = "301 /slides/about-this-site"; + "~ ^(/gpg)$".return = "301 /cards/gpg"; + "~ ^(/contact)$".return = "301 /cards/contact"; + "~ ^(/ba)$".return = "301 /BA.pdf"; }; }; "matrix.${hyper.domain}" = { listen = dl; - locations = { "~.*" = { return = "502"; }; }; + locations."~.*".return = "502"; }; # "pw.${hyper.domain}" = vh // { # listen = dl;