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

Allow including custom nginx conf files #178

Merged
merged 3 commits into from Aug 9, 2019

Conversation

@cmer
Copy link
Contributor

commented Jul 26, 2019

Give advanced users more flexibility by allowing them to include custom config files at differents locations in the nginx configuration.

/data/nginx/custom/root.conf: Included at the very end of nginx.conf
/data/nginx/custom/http.conf: Included at the end of the main http block
/data/nginx/custom/server_proxy.conf: Included at the end of every proxy server block
/data/nginx/custom/server_redirect.conf: Included at the end of every redirection server block
/data/nginx/custom/server_stream.conf: Included at the end of every stream server block
/data/nginx/custom/server_stream_tcp.conf: Included at the end of every TCP stream server block
/data/nginx/custom/server_stream_udp.conf: Included at the end of every UDP stream server block

Allow including custom nginx conf files
Give advanced users more flexibility by allowing them to include custom config files at differents locations in the nginx configuration.

`/data/nginx/custom/root.conf`: Included at the very end of nginx.conf
`/data/nginx/custom/http.conf`: Included at the end of the main `http` block
`/data/nginx/custom/server_proxy.conf`: Included at the end of every proxy `server` block
`/data/nginx/custom/server_redirect.conf`: Included at the end of every redirection `server` block
`/data/nginx/custom/server_stream.conf`: Included at the end of every stream `server` block
`/data/nginx/custom/server_stream_tcp.conf`: Included at the end of every TCP stream `server` block
`/data/nginx/custom/server_stream_udp.conf`: Included at the end of every UDP stream `server` block
@jc21

This comment has been minimized.

Copy link
Owner

commented Jul 26, 2019

Docker Image for build 1 is available on DockerHub as jc21/nginx-proxy-manager:github-pr-178-amd64

@jc21

This comment has been minimized.

Copy link
Owner

commented Aug 9, 2019

Docker Image for build 2 is available on DockerHub as jc21/nginx-proxy-manager:github-pr-178-amd64

@cmer

This comment has been minimized.

Copy link
Contributor Author

commented Aug 9, 2019

Is there any interest in this @jc21? Seems like a sensible thing to add for power users? TIA!

@jc21

This comment has been minimized.

Copy link
Owner

commented Aug 9, 2019

Yeah it wouldn't hurt. Might need some documentation, could you make a new markdown file in doc folder?

@cmer

This comment has been minimized.

Copy link
Contributor Author

commented Aug 9, 2019

I added some docs. LMK if this is what you had in mind or not.

@jc21

This comment has been minimized.

Copy link
Owner

commented Aug 9, 2019

Awesome. Pull the CI docker image here and give it a real world test. If you're happy with it I'll merge.

@jc21

This comment has been minimized.

Copy link
Owner

commented Aug 9, 2019

Docker Image for build 3 is available on DockerHub as jc21/nginx-proxy-manager:github-pr-178-amd64

@cmer

This comment has been minimized.

Copy link
Contributor Author

commented Aug 9, 2019

Works for me... and doesn't cause issues if custom snippet files are not present.

@jc21 jc21 merged commit 31aa9c9 into jc21:master Aug 9, 2019

9 checks passed

Build Develop Stage did not run due to when conditional
Details
Build Master Stage did not run due to when conditional
Details
Build PR Stage built successfully
Details
Develop Cleanup Stage did not run due to when conditional
Details
Develop Manifest Stage did not run due to when conditional
Details
Latest Cleanup Stage did not run due to when conditional
Details
Latest Manifest Stage did not run due to when conditional
Details
PR Cleanup Stage built successfully
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
@jc21

This comment has been minimized.

Copy link
Owner

commented Aug 9, 2019

If you want to do more patches in future, can you please push them to the develop branch :)

@cmer cmer deleted the cmer:custom_nginx_includes branch Aug 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.