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

Nginx fix #935

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Nginx fix #935

merged 3 commits into from
Sep 21, 2023

Conversation

XavierMetichecchia
Copy link
Contributor

Summary

This PR reformats the nginx configuration using new nginx building supported {{env}} replacements as well as removing the erb if statements and using nginx built in statements for "if" conditionals.

This PR is for testing in develop.

Resolves Issue # https://github.com/orgs/18F/projects/55/views/1?pane=issue&itemId=38536224

Describe the pull request here, including any supplemental information needed to understand it.

Impacted Areas of the Site

Nginx configuration

Optional Screenshots

This pull request changes...

  • [nginx.conf]

This pull request is ready to merge when...

  • Tests have been updated (and all tests are passing)
  • This code has been reviewed by someone other than the original author
  • The change has been documented

@XavierMetichecchia XavierMetichecchia self-assigned this Sep 19, 2023
@XavierMetichecchia XavierMetichecchia changed the base branch from develop to master September 19, 2023 14:13
@ryanwoldatwork
Copy link
Contributor

@XavierMetichecchia - can this be merged into a non-master branch for deployment to dev or staging first?

@XavierMetichecchia
Copy link
Contributor Author

XavierMetichecchia commented Sep 19, 2023

@XavierMetichecchia - can this be merged into a non-master branch for deployment to dev or staging first?

@ryanwoldatwork Well I was going to merge it into develop but it seems develop is way behind main. Am I clear to pull main into develop first?

@XavierMetichecchia XavierMetichecchia changed the base branch from master to develop September 20, 2023 18:54
@XavierMetichecchia XavierMetichecchia merged commit 977c168 into develop Sep 21, 2023
4 checks passed
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.

2 participants