Fixes #104 - allow using / location in custom location

This commit is contained in:
Jamie Curnow
2019-05-08 15:33:54 +10:00
parent 4d5adefa41
commit 22e8961c80
2 changed files with 14 additions and 6 deletions

View File

@@ -162,7 +162,7 @@ const internalNginx = {
renderedLocations += await renderer.parseAndRender(template, locationCopy);
}
}
};
locationRendering().then(() => resolve(renderedLocations));
});
@@ -211,6 +211,14 @@ const internalNginx = {
locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => {
host.locations = renderedLocations;
});
// Allow someone who is using / custom location path to use it, and skip the default / location
_.map(host.locations, (location) => {
if (location.path === '/') {
host.use_default_location = false;
}
});
} else {
locationsPromise = Promise.resolve();
}