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.

Sign up for GitHub

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

Jump to bottom

feat: modify docs for Apache APISIX 2.1 #91

Merged
merged 6 commits into from Dec 1, 2020
Merged

feat: modify docs for Apache APISIX 2.1 #91

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a63b7c
change: modify docs for Apache APISIX 2.1
gxthrj Dec 1, 2020
64f88d7
fix: rm repeat desc
gxthrj Dec 1, 2020
9aacb28
fix: Distinguish between 1.x and 2.x
gxthrj Dec 1, 2020
e69b005
fix: keep the image from Apache APISIX is built from master in docker…
gxthrj Dec 1, 2020
87213a8
change: update default configuration in config.yaml
gxthrj Dec 1, 2020
601e7e5
change(doc): remove the gen-config-yaml which is not needed any more
gxthrj Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion example/apisix_conf/config.yaml
View file
Open in desktop
@@ -1,5 +1,6 @@
apisix:
membphis marked this conversation as resolved.
Show resolved Hide resolved
node_listen: 9080 # APISIX listening port
enable_ipv6: false

allow_admin: # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
- 127.0.0.0/24 # If we don't set any IP list, then any IP access is allowed by default.
Expand All @@ -18,5 +19,5 @@ etcd:
host: # it's possible to define multiple etcd hosts addresses of the same etcd cluster.
- "http://172.18.5.10:2379" # multiple etcd address
prefix: "/apisix" # apisix configurations prefix
timeout: 3 # 3 seconds
timeout: 30 # 30 seconds

1 change: 0 additions & 1 deletion example/docker-compose.yml
View file
Open in desktop
@@ -1,7 +1,6 @@
version: "3"

services:

apisix:
build:
context: ./..
Expand Down