diff --git a/hosts/bekkalokk/services/nginx/ingress.nix b/hosts/bekkalokk/services/nginx/ingress.nix index 55da4a03..dc3c17b2 100644 --- a/hosts/bekkalokk/services/nginx/ingress.nix +++ b/hosts/bekkalokk/services/nginx/ingress.nix @@ -6,21 +6,21 @@ addSSL = true; enableACME = true; - locations = { - # Proxy home directories - "/~" = { - extraConfig = '' + locations = let + proxy_tom = '' proxy_redirect off; proxy_pass https://tom.pvv.ntnu.no; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - ''; - }; + ''; + in { + # Proxy home directories + "/~".extraConfig = proxy_tom; - # Redirect old wiki entries - "/disk".return = "301 https://www.pvv.ntnu.no/pvv/Diskkjøp"; + # Redirect old wiki entries - TODO: Move these to the main website + "= /disk".return = "301 https://www.pvv.ntnu.no/pvv/Diskkjøp"; "/dok/boker.php".return = "301 https://www.pvv.ntnu.no/pvv/Bokhyllen"; "/styret/lover/".return = "301 https://www.pvv.ntnu.no/pvv/Lover"; "/styret/".return = "301 https://www.pvv.ntnu.no/pvv/Styret"; @@ -29,9 +29,11 @@ "/medlemssider/meldinn.php".return = "301 https://www.pvv.ntnu.no/pvv/Medlemskontingent"; "/diverse/medlems-sider.php".return = "301 https://www.pvv.ntnu.no/pvv/Medlemssider"; "/cert/".return = "301 https://www.pvv.ntnu.no/pvv/CERT"; - "/drift".return = "301 https://www.pvv.ntnu.no/pvv/Drift"; + "= /drift".return = "301 https://www.pvv.ntnu.no/pvv/Drift"; "/diverse/abuse.php".return = "301 https://www.pvv.ntnu.no/pvv/CERT/Abuse"; "/nerds/".return = "301 https://www.pvv.ntnu.no/pvv/Nerdepizza"; + "/pvvmud/".extraConfig = proxy_tom; + "= /pvvmud".return = "301 $request_uri/"; # TODO: Redirect webmail "/webmail".return = "301 https://webmail.pvv.ntnu.no/squirrelmail";