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

feat: update nginx and docker-compose files to support HTTPS. #2940

Merged
merged 13 commits into from Mar 26, 2024

Conversation

Kennytian
Copy link
Contributor

@Kennytian Kennytian commented Mar 22, 2024

Description

Please include a summary of the changes and which issues are fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update, included: Dify Document
  • Improvement,including but not limited to code refactoring, performance optimization, and UI/UX improvement
  • Dependency upgrade

How Has This Been Tested?

I have tested the code I submitted locally and everything works fine. Additionally, this change supports both HTTP and HTTPS requests. To enable HTTPS support, simply uncomment the code in the docker/nginx/conf.d/default.conf file and put the SSL certificate files in the docker/nginx/ssl/ directory.

Suggested Checklist:

  • I have performed a self-review of my own code.
  • I have commented on my code, particularly in hard-to-understand areas
  • My changes generate no new warnings.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods
  • optional I have made corresponding changes to the documentation
  • optional I have added tests that prove my fix is effective or that my feature works
  • optional New and existing unit tests passed locally with my changes

@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Mar 22, 2024
@Kennytian Kennytian changed the title Update default.conf feat: update nginx and docker-compose files to support HTTPS. Mar 22, 2024
@Kennytian
Copy link
Contributor Author

@takatost Please review my PR :)

Copy link
Member

@crazywoola crazywoola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend commenting on these lines, so that you can remove them when you need to, rather than having port 443 open by default in the first place

docker/docker-compose.yaml Outdated Show resolved Hide resolved
docker/docker-compose.yaml Outdated Show resolved Hide resolved
@Kennytian
Copy link
Contributor Author

@crazywoola Thanks for your reply, I agree with you, and then will commenting on these lines right now.

Kennytian and others added 2 commits March 26, 2024 10:30
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
@dosubot dosubot bot added the 🌞 lgtm This PR has been approved by a maintainer label Mar 26, 2024
@crazywoola crazywoola merged commit 08a5afc into langgenius:main Mar 26, 2024
7 checks passed
@Kennytian Kennytian deleted the patch-1 branch March 26, 2024 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌞 lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants