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

Add new Nginx config to base image #918

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Add new Nginx config to base image #918

merged 1 commit into from
Jan 22, 2025

Conversation

nbianca
Copy link
Member

@nbianca nbianca commented Jan 17, 2025

This commit moves the Nginx config from discourse/discourse repository
and updates it with several 'include' statements that serve as extension
outlets.

This change was made to place the config closer to where it is used and
implements an alternative to the "find & replace" hacks.

It is unused at this moment, but all templates and samples will be
updated in a future commit.

This commit moves the Nginx config from discourse/discourse repository
and updates it with several 'include' statements that serve as extension
outlets.

This change was made to place the config closer to where it is used and
implements an alternative to the "find & replace" hacks.

It is unused at this moment, but all templates and samples will be
updated in a future commit.
@nbianca nbianca changed the title Add Nginx configuration to base image Add new Nginx config to base image Jan 17, 2025
@tgxworld
Copy link
Contributor

@nbianca Do confirm that the existing web template will override the nginx conf file that has been added to the base image:

- "cp $home/config/nginx.sample.conf /etc/nginx/conf.d/discourse.conf"

@nbianca
Copy link
Member Author

nbianca commented Jan 20, 2025

Do confirm that the existing web template will override the nginx conf file that has been added to the base image:

cp will overwrite the target file without warning if that happens, so it should work as before.

@nbianca nbianca merged commit 32dc866 into main Jan 22, 2025
5 checks passed
@nbianca nbianca deleted the dev-nginx-conf-2 branch January 22, 2025 18:13
nbianca added a commit that referenced this pull request Jan 22, 2025
We have decided to go another route and keep the Nginx config in the
Discourse repository, but add the outlets there.

This reverts commit 32dc866.
tgxworld pushed a commit that referenced this pull request Jan 23, 2025
We have decided to go another route and keep the Nginx config in the
Discourse repository, but add the outlets there.

This reverts commit 32dc866.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants