Parcourir la source

docs: remove port 8081

port 8081 is the management API in 4.x
in 5.0 api port is 18083 (same as for serving the dashboard)
Zaiming (Stone) Shi il y a 3 ans
Parent
commit
abb941d161

+ 2 - 3
Dockerfile.ubuntu20.04.runner

@@ -27,15 +27,14 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data"]
 
 # emqx will occupy these port:
 # - 1883 port for MQTT
-# - 8081 for mgmt API
 # - 8083 for WebSocket/HTTP
 # - 8084 for WSS/HTTPS
 # - 8883 port for MQTT(SSL)
 # - 11883 port for internal MQTT/TCP
-# - 18083 for dashboard
+# - 18083 for dashboard and API
 # - 4370 default Erlang distrbution port
 # - 5369 for backplain gen_rpc
-EXPOSE 1883 8081 8083 8084 8883 11883 18083 4370 5369
+EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 

+ 0 - 6
README-CN.md

@@ -32,12 +32,6 @@ EMQX 自 2013 年在 GitHub 发布开源版本以来,获得了来自 50 多个
 docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx:latest
 ```
 
-或直接试用 EMQX 企业版(已内置 10 个并发连接的永不过期 License)
-
-```
-docker run -d --name emqx-ee -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx-ee:latest
-```
-
 接下来请参考 [入门指南](https://www.emqx.io/docs/zh/v5.0/getting-started/getting-started.html#启动-emqx) 开启您的 EMQX 之旅。
 
 #### 在 Kubernetes 上运行 EMQX 集群

+ 1 - 7
README-RU.md

@@ -28,13 +28,7 @@
 #### Установка EMQX с помощью Docker
 
 ```
-docker run -d --name emqx -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
-```
-
-Или запустите EMQX Enterprise со встроенной бессрочной лицензией на 10 соединений.
-
-```
-docker run -d --name emqx-ee -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx-ee:latest
+docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8883:8883 -p 8084:8084 -p 18083:18083 emqx/emqx
 ```
 
 Чтобы ознакомиться с функциональностью EMQX, пожалуйста, следуйте [руководству по началу работы](https://www.emqx.io/docs/en/v5.0/getting-started/getting-started.html#start-emqx).

+ 0 - 6
README.md

@@ -33,12 +33,6 @@ The simplest way to set up EMQX is to create a managed deployment with EMQX Clou
 docker run -d --name emqx -p 1883:1883 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx:latest
 ```
 
-Or install EMQX Enterprise with a built-in license for ten connections that never expire.
-
-```
-docker run -d --name emqx-ee -p 1883:1883 -p 8081:8081 -p 8083:8083 -p 8084:8084 -p 8883:8883 -p 18083:18083 emqx/emqx-ee:latest
-```
-
 Next, please follow the [getting started guide](https://www.emqx.io/docs/en/v5.0/getting-started/getting-started.html#start-emqx) to tour the EMQX features.
 
 #### Run EMQX cluster on kubernetes

+ 0 - 8
apps/emqx_dashboard/test/emqx_dashboard_SUITE.erl

@@ -74,14 +74,6 @@ end_per_suite(_Config) ->
     emqx_common_test_helpers:stop_apps([emqx_dashboard, emqx_management]),
     mria:stop().
 
-set_special_configs(emqx_management) ->
-    Listeners = #{http => #{port => 8081}},
-    Config = #{
-        listeners => Listeners,
-        applications => [#{id => "admin", secret => "public"}]
-    },
-    emqx_config:put([emqx_management], Config),
-    ok;
 set_special_configs(emqx_dashboard) ->
     emqx_dashboard_api_test_helpers:set_default_config(),
     ok;

+ 1 - 2
deploy/charts/emqx-enterprise/README.md

@@ -60,10 +60,9 @@ The following table lists the configurable parameters of the emqx chart and thei
 | `service.type`                       | Kubernetes Service type.                                                                                                                                     | ClusterIP                                               |
 | `service.mqtt`                       | Port for MQTT.                                                                                                                                               | 1883                                                    |
 | `service.mqttssl`                    | Port for MQTT(SSL).                                                                                                                                          | 8883                                                    |
-| `service.mgmt`                       | Port for mgmt API.                                                                                                                                           | 8081                                                    |
 | `service.ws`                         | Port for WebSocket/HTTP.                                                                                                                                     | 8083                                                    |
 | `service.wss`                        | Port for WSS/HTTPS.                                                                                                                                          | 8084                                                    |
-| `service.dashboard`                  | Port for dashboard.                                                                                                                                          | 18083                                                   |
+| `service.dashboard`                  | Port for dashboard and API.                                                                                                                                  | 18083                                                   |
 | `service.nodePorts.mqtt`             | Kubernetes node port for MQTT.                                                                                                                               | nil                                                     |
 | `service.nodePorts.mqttssl`          | Kubernetes node port for MQTT(SSL).                                                                                                                          | nil                                                     |
 | `service.nodePorts.mgmt`             | Kubernetes node port for mgmt API.                                                                                                                           | nil                                                     |

+ 2 - 5
deploy/charts/emqx-enterprise/values.yaml

@@ -123,19 +123,16 @@ service:
   ## Port for MQTT(SSL)
   ##
   mqttssl: 8883
-  ## Port for mgmt API
-  ##
-  mgmt: 8081
   ## Port for WebSocket/HTTP
   ##
   ws: 8083
   ## Port for WSS/HTTPS
   ##
   wss: 8084
-  ## Port for dashboard
+  ## Port for dashboard and API
   ##
   dashboard: 18083
-  ## Port for dashboard HTTPS
+  ## Port for dashboard and API over HTTPS
   ##
   # dashboardtls: 18084
   ## Specify the nodePort(s) value for the LoadBalancer and NodePort service types.

+ 1 - 2
deploy/charts/emqx/README.md

@@ -60,10 +60,9 @@ The following table lists the configurable parameters of the emqx chart and thei
 | `service.type`                       | Kubernetes Service type.                                                                                                                                     | ClusterIP                                               |
 | `service.mqtt`                       | Port for MQTT.                                                                                                                                               | 1883                                                    |
 | `service.mqttssl`                    | Port for MQTT(SSL).                                                                                                                                          | 8883                                                    |
-| `service.mgmt`                       | Port for mgmt API.                                                                                                                                           | 8081                                                    |
 | `service.ws`                         | Port for WebSocket/HTTP.                                                                                                                                     | 8083                                                    |
 | `service.wss`                        | Port for WSS/HTTPS.                                                                                                                                          | 8084                                                    |
-| `service.dashboard`                  | Port for dashboard.                                                                                                                                          | 18083                                                   |
+| `service.dashboard`                  | Port for dashboard and API.                                                                                                                                  | 18083                                                   |
 | `service.nodePorts.mqtt`             | Kubernetes node port for MQTT.                                                                                                                               | nil                                                     |
 | `service.nodePorts.mqttssl`          | Kubernetes node port for MQTT(SSL).                                                                                                                          | nil                                                     |
 | `service.nodePorts.mgmt`             | Kubernetes node port for mgmt API.                                                                                                                           | nil                                                     |

+ 2 - 5
deploy/charts/emqx/values.yaml

@@ -125,19 +125,16 @@ service:
   ## Port for MQTT(SSL)
   ##
   mqttssl: 8883
-  ## Port for mgmt API
-  ##
-  mgmt: 8081
   ## Port for WebSocket/HTTP
   ##
   ws: 8083
   ## Port for WSS/HTTPS
   ##
   wss: 8084
-  ## Port for dashboard
+  ## Port for dashboard and API
   ##
   dashboard: 18083
-  ## Port for dashboard HTTPS
+  ## Port for dashboard and API over HTTPS
   ##
   # dashboardtls: 18084
   ## Specify the nodePort(s) value for the LoadBalancer and NodePort service types.

+ 2 - 3
deploy/docker/Dockerfile

@@ -49,15 +49,14 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data"]
 
 # emqx will occupy these port:
 # - 1883 port for MQTT
-# - 8081 for mgmt API
 # - 8083 for WebSocket/HTTP
 # - 8084 for WSS/HTTPS
 # - 8883 port for MQTT(SSL)
 # - 11883 port for internal MQTT/TCP
-# - 18083 for dashboard
+# - 18083 for dashboard and API
 # - 4370 default Erlang distribution port
 # - 5369 for backplain gen_rpc
-EXPOSE 1883 8081 8083 8084 8883 11883 18083 4370 5369
+EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 

+ 2 - 3
deploy/docker/Dockerfile.alpine

@@ -62,15 +62,14 @@ VOLUME ["/opt/emqx/log", "/opt/emqx/data"]
 
 # emqx will occupy these port:
 # - 1883 port for MQTT
-# - 8081 for mgmt API
 # - 8083 for WebSocket/HTTP
 # - 8084 for WSS/HTTPS
 # - 8883 port for MQTT(SSL)
 # - 11883 port for internal MQTT/TCP
-# - 18083 for dashboard
+# - 18083 for dashboard and API
 # - 4370 default Erlang distrbution port
 # - 5369 for backplain gen_rpc
-EXPOSE 1883 8081 8083 8084 8883 11883 18083 4370 5369
+EXPOSE 1883 8083 8084 8883 11883 18083 4370 5369
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]