docs: change EMQ X to EMQX in more descriptive info

This commit is contained in:
Zaiming (Stone) Shi 2022-02-15 22:18:25 +01:00
parent a5f6e94467
commit d2840a8aa1
10 changed files with 15 additions and 15 deletions

2
NOTICE
View File

@ -1,4 +1,4 @@
EMQ X, a highly scalable, highly available distributed MQTT messaging broker for IoT. EMQX, a highly scalable, highly available distributed MQTT messaging broker for IoT.
Copyright (c) 2017-2021 EMQ Technologies Co., Ltd. All Rights Reserved. Copyright (c) 2017-2021 EMQ Technologies Co., Ltd. All Rights Reserved.
This product contains code developed at EMQ Technologies Co., Ltd. This product contains code developed at EMQ Technologies Co., Ltd.

View File

@ -44,7 +44,7 @@ if ! check_eralng_start >/dev/null 2>&1; then
echoerr "FATAL: Unable to start Erlang." echoerr "FATAL: Unable to start Erlang."
echoerr "Please make sure openssl-1.1.1 (libcrypto) and libncurses are installed." echoerr "Please make sure openssl-1.1.1 (libcrypto) and libncurses are installed."
echoerr "Also ensure it's running on the correct platform," echoerr "Also ensure it's running on the correct platform,"
echoerr "this EMQ X release is built for $BUILT_ON" echoerr "this EMQX release is built for $BUILT_ON"
exit 1 exit 1
fi fi
echoerr "WARNING: There seem to be missing dynamic libs from the OS. Using libs from ${DYNLIBS_DIR}" echoerr "WARNING: There seem to be missing dynamic libs from the OS. Using libs from ${DYNLIBS_DIR}"

View File

@ -24,7 +24,7 @@ collect() {
} }
show_help() { show_help() {
echo "Collect information about the EMQ X node echo "Collect information about the EMQX node
USAGE: USAGE:

View File

@ -1,6 +1,6 @@
apiVersion: v2 apiVersion: v2
name: emqx name: emqx
description: A Helm chart for EMQ X description: A Helm chart for EMQX
# A chart can be either an 'application' or a 'library' chart. # A chart can be either an 'application' or a 'library' chart.
# #
# Application charts are a collection of templates that can be packaged into versioned archives # Application charts are a collection of templates that can be packaged into versioned archives

View File

@ -62,13 +62,13 @@ resources: {}
# cpu: 500m # cpu: 500m
# memory: 512Mi # memory: 512Mi
# Containers that run before the creation of EMQ X containers. They can contain utilities or setup scripts. # Containers that run before the creation of EMQX containers. They can contain utilities or setup scripts.
initContainers: {} initContainers: {}
# - name: mysql-probe # - name: mysql-probe
# image: alpine # image: alpine
# command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 mysql 3306 && exit 0 || sleep 3; done; exit 1"] # command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 mysql 3306 && exit 0 || sleep 3; done; exit 1"]
## EMQ X configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx) ## EMQX configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx)
emqxConfig: emqxConfig:
EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc:443" EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc:443"
## The address type is used to extract host from k8s service. ## The address type is used to extract host from k8s service.
@ -119,7 +119,7 @@ emqxLoadedModules: >
{emqx_mod_subscription, false}. {emqx_mod_subscription, false}.
{emqx_mod_topic_metrics, false}. {emqx_mod_topic_metrics, false}.
## EMQ X Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName" ## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
## Example: ## Example:
## kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic ## kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic
emqxLicenseSecretName: emqxLicenseSecretName:
@ -188,7 +188,7 @@ ingress:
## Ingress shared annotations ## Ingress shared annotations
annotations: {} annotations: {}
## ingress for EMQ X Dashboard ## ingress for EMQX Dashboard
dashboard: dashboard:
enabled: false enabled: false
annotations: {} annotations: {}
@ -199,7 +199,7 @@ ingress:
- dashboard.emqx.local - dashboard.emqx.local
tls: [] tls: []
## ingress for EMQ X Mgmt API ## ingress for EMQX Mgmt API
mgmt: mgmt:
enabled: false enabled: false
annotations: {} annotations: {}
@ -210,7 +210,7 @@ ingress:
- api.emqx.local - api.emqx.local
tls: [] tls: []
## ingress for EMQ X Mgmt API ## ingress for EMQX Mgmt API
wss: wss:
enabled: false enabled: false
# ingressClassName: nginx # ingressClassName: nginx

View File

@ -38,7 +38,7 @@ LABEL org.label-schema.docker.dockerfile="Dockerfile" \
org.label-schema.url="https://emqx.io" \ org.label-schema.url="https://emqx.io" \
org.label-schema.vcs-type="Git" \ org.label-schema.vcs-type="Git" \
org.label-schema.vcs-url="https://github.com/emqx/emqx" \ org.label-schema.vcs-url="https://github.com/emqx/emqx" \
maintainer="EMQ X Team <support@emqx.io>" maintainer="EMQX Team <support@emqx.io>"
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
## EMQ docker image start script ## EMQ docker image start script
# Huang Rui <vowstar@gmail.com> # Huang Rui <vowstar@gmail.com>
# EMQ X Team <support@emqx.io> # EMQX Team <support@emqx.io>
## Shell setting ## Shell setting
if [[ -n "$DEBUG" ]]; then if [[ -n "$DEBUG" ]]; then

View File

@ -1,5 +1,5 @@
###################################################################### ######################################################################
## Erlang VM Args for EMQ X Broker ## Erlang VM Args
###################################################################### ######################################################################
## NOTE: ## NOTE:

View File

@ -1,5 +1,5 @@
###################################################################### ######################################################################
## Erlang VM Args for EMQ X Edge ## Erlang VM Args
###################################################################### ######################################################################
## NOTE: ## NOTE:

View File

@ -2,7 +2,7 @@
set -euo pipefail set -euo pipefail
## This script prints the relup upgrade base versions ## This script prints the relup upgrade base versions
## for the given EMQ X edition (specified as first arg) ## for the given EMQX edition (specified as first arg)
## ##
## The second argument is the current release version ## The second argument is the current release version
## if not provided, it's taken from pkg-vsn.sh ## if not provided, it's taken from pkg-vsn.sh