New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
DOCS: Update nginx configuration for SilverStripe 4 #7812
Conversation
We'll get these merged up so we don't need a PR for it |
@dhensby There’s a crucial difference for SilverStripe 4: the try_files directive uses index.php rather than main.php. |
ok, @oddnoc have you also updated the nginx wiki: https://www.nginx.com/resources/wiki/start/topics/recipes/silverstripe/ ? |
0ecf1d4
to
8d6d985
Compare
OK, I've cherry-picked the commit and put it on the 4.0 branch so we don't get all those unrelated commits in this PR. Please can you recheck this as I had to resolve some conflicts and they looked quite major and I just blindly accepted your changes |
0ecf1d4
to
6159475
Compare
@dhensby I think I see part of the problem. I meant to use 4, not 4.0, as the base, and now I've updated the base. But I don't see where you cherry-picked a commit into 4.0 (or 4). Hadn't thought about the wiki, so thanks for the reminder. But I'll be happy to update the nginx wiki once the SilverStripe project has settled on the sample config. |
Right, but what's wrong with putting it on 4.0, is the change not applicable to 4.0 and only to 4.x? Was there something wrong with the changes I had made to the PR?
Ok |
Would you rather have the PR against the 4.0 branch? Happy to accommodate. The new try_files would apply equally to any 4.x, including 4.0. |
For reference, we often ask for docs changes to go into the 4 branch because that's the branch that we use for generating docs.silverstripe.org. If you merge into 4.0 it will still end up in the 4 branch eventually, it'll just take longer to get there |
SS4 uses /index.php so the location block and documentation need to also use that.
30dfb13
to
6976d09
Compare
Port nginx configuration changes from 3.