Skip to content
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

Change custom error page location & remove htpasswd placeholder #1530

Merged
merged 2 commits into from
Jun 17, 2024

Conversation

dchiller
Copy link
Contributor

@dchiller dchiller commented Jun 14, 2024

This PR fixes features that were added in #1520.

#1520 added a placeholder password file (nginx/password/.htpasswd) that was then overwritten on the staging server by ansible. This meant that subsequent deployments with ansible on the staging server would fail because a subsequent git pull would find changes to the local working directory. This PR removes that placeholder .htpasswd file.

This PR also refactors the custom error pages served by nginx to make the nginx configuration file simpler.

Finally, the custom error page was not showing when gunicorn returned a 500 error. Turning the proxy_intercept_errors configuration "on" means that nginx now intercepts this error from gunicorn and serves the custom 500 error page.

Fixes #1519. Refs https://github.com/dact-chant/ansible.cantus-db/issues/41.

@dchiller dchiller force-pushed the refactor-error-pgs-and-psswd branch from 30aba04 to 2c4fb30 Compare June 14, 2024 14:33
@dchiller dchiller marked this pull request as ready for review June 14, 2024 14:35
@dchiller dchiller merged commit 94e6c57 into DDMAL:develop Jun 17, 2024
1 check passed
@dchiller dchiller deleted the refactor-error-pgs-and-psswd branch June 17, 2024 17:09
@dchiller dchiller mentioned this pull request Jul 12, 2024
27 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add custom 500 error page
2 participants