Directly translate path option into location entry

nixcloud · May 29, 2018 · 211b0a3 · 211b0a3
1 parent 3cadee9
commit 211b0a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/modules/services/reverse-proxy/default.nix b/modules/services/reverse-proxy/default.nix
@@ -145,7 +145,7 @@ in
         m = location.${mode}.mode;
         b = location.${mode}.basicAuth;
         r = location.${mode}.record;
-        l = builtins.toPath (location.path);
+        l = location.path;
         f = location.${mode}.flags;
         e = location.${mode}.extraFlags;
       in

diff --git a/modules/services/reverse-proxy/options.nix b/modules/services/reverse-proxy/options.nix
@@ -146,7 +146,8 @@ in
       apply = checkPath;
       description = ''
         The 'subpath' is actually a subdirectory in the URL and the `path` variable from the proxyOption is prepended.
-        A subpath must start with a leading "/" and may not have white spaces or a trailing "/" in it.
+        A subpath must start with a leading "/" and may not have white spaces in it.
+        Note that the presence of a trailing slash affects the behaviour of the route matcher.
       '';
     };
     websockets = mkOption {