You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/07/13 05:42:12 UTC

[apisix] branch master updated: docs: fix standalone mode yaml config (#4593)

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 247bf4c  docs: fix standalone mode yaml config (#4593)
247bf4c is described below

commit 247bf4c5c5489ce1f0d6e31580afe26a47581351
Author: Shuyang Wu <wo...@gmail.com>
AuthorDate: Tue Jul 13 01:42:05 2021 -0400

    docs: fix standalone mode yaml config (#4593)
    
    Signed-off-by: yiyiyimu <wo...@gmail.com>
---
 docs/en/latest/stand-alone.md | 12 +++++-------
 docs/zh/latest/stand-alone.md | 14 ++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/docs/en/latest/stand-alone.md b/docs/en/latest/stand-alone.md
index f095534..736bd39 100644
--- a/docs/en/latest/stand-alone.md
+++ b/docs/en/latest/stand-alone.md
@@ -32,20 +32,18 @@ The routing rules in the `conf/apisix.yaml` file are loaded into memory immediat
 
 *Note*: When reloading and updating routing rules, they are all hot memory updates, and there will be no replacement of working processes, it is a hot update.
 
-To enable Stand-alone model, we can set `apisix.config_center` to `yaml` in file `conf/config.yaml`.
+Since the current Admin API is based on the etcd configuration center solution, enable Admin API is not allowed when the Stand-alone mode is enabled.
+
+To enable Stand-alone mode, we can set `apisix.config_center` to `yaml` and disable Admin API in file `conf/config.yaml`.
 
 Refer to the example below:
 
 ```yaml
 apisix:
-  # ...
-  config_center: yaml   # etcd: use etcd to store the config value
-                        # yaml: fetch the config value from local yaml file
-                        # `/your_path/conf/apisix.yaml`
+  enable_admin: false
+  config_center: yaml
 ```
 
-In addition, since the current Admin API is based on the etcd configuration center solution, enable Admin API is not allowed when the Stand-alone mode is enabled.
-
 ### How to configure rules
 
 All of the rules are stored in one file which named `conf/apisix.yaml`,
diff --git a/docs/zh/latest/stand-alone.md b/docs/zh/latest/stand-alone.md
index fe993b8..08550b4 100644
--- a/docs/zh/latest/stand-alone.md
+++ b/docs/zh/latest/stand-alone.md
@@ -33,22 +33,20 @@ APISIX 节点服务启动后会立刻加载 `conf/apisix.yaml` 文件中的路
 
 *注意*:重新加载规则并更新时,均是内存热更新,不会有工作进程的替换过程,是个热更新过程。
 
-通过设置 `conf/config.yaml` 中的 `apisix.config_center` 选项为 `yaml` 表示启
+由于目前 Admin API 都是基于 etcd 配置中心解决方案,当开启 Stand-alone 模式后,
+Admin API 将不再被允许使用。
+
+通过设置 `conf/config.yaml` 中的 `apisix.config_center` 选项为 `yaml` ,并禁用 Admin API 即可启
 用 Stand-alone 模式。
 
 参考下面示例:
 
 ```yaml
 apisix:
-  # ...
-  config_center: yaml             # etcd: use etcd to store the config value
-                                  # yaml: fetch the config value from local yaml file `/your_path/conf/apisix.yaml`
-# ...
+  enable_admin: false
+  config_center: yaml
 ```
 
-此外由于目前 Admin API 都是基于 etcd 配置中心解决方案,当开启 Stand-alone 模式后,
-Admin API 将不再被允许使用。
-
 ### 如何配置规则
 
 所有的路由规则均存放在 `conf/apisix.yaml` 这一个文件中,APISIX 会以每秒(默认)频率检查文件是否有变化,如果有变化,则会检查文件末尾是否能找到 `#END` 结尾,找到后则重新加载文件更新到内存。