Skip to content

feat: support include other nginx config#2803

Merged
spacewander merged 4 commits into
apache:masterfrom
spacewander:nsp
Nov 25, 2020
Merged

feat: support include other nginx config#2803
spacewander merged 4 commits into
apache:masterfrom
spacewander:nsp

Conversation

@spacewander

@spacewander spacewander commented Nov 20, 2020

Copy link
Copy Markdown
Member

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
Copy Markdown
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
Copy Markdown
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

nic-chen commented Nov 25, 2020

Copy link
Copy Markdown
Member

should add some doc to guide users.

@spacewander

Copy link
Copy Markdown
Member Author

@nic-chen @membphis
Doc added.

@membphis

Copy link
Copy Markdown
Member

@spacewander

Copy link
Copy Markdown
Member Author

@membphis
Solved.

@membphis

Copy link
Copy Markdown
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

Development

Successfully merging this pull request may close these issues.

support include other nginx config in the apisix(lua file) [DISCUSS] "config.yaml" supports annotation configuration

4 participants