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: support include other nginx config #2803

Merged
merged 4 commits into from
Nov 25, 2020
Merged

Conversation

spacewander
Copy link
Member

@spacewander spacewander commented Nov 20, 2020

Close #2565
Close #1620

What this PR does / why we need it:

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible?

stream_proxy:
tcp:
- 9100
nginx_config:
Copy link
Member

Choose a reason for hiding this comment

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

How about this style? I think one level is enough and it looks simpler.

nginx_config:
    main_configuration_snippet: |
        daemon on;
    http_configuration_snippet: |
        chunked_transfer_encoding on;
    http_server_configuration_snippet: |
        set $my "var";
    http_admin_configuration_snippet: |
        log_format admin "$request_time $pipe";
    stream_configuration_snippet: |
        tcp_nodelay off;

Copy link
Member Author

Choose a reason for hiding this comment

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

@membphis
Changed.

@nic-chen
Copy link
Member

nic-chen commented Nov 25, 2020

should add some doc to guide users.

@spacewander
Copy link
Member Author

@nic-chen @membphis
Doc added.

@membphis
Copy link
Member

@spacewander
Copy link
Member Author

@membphis
Solved.

@membphis
Copy link
Member

@nic-chen please take a look when you have time

@spacewander spacewander merged commit c6c2e3c into apache:master Nov 25, 2020
@moonming moonming modified the milestones: 2.2, 2.1 Dec 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants