msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix: kafka environment port

Browse Source 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
pull/926/head
Xinwei Xiong(cubxxw-openim) 2 years ago
parent 0d59d42460
commit 15a09c90ab
No known key found for this signature in database
GPG Key ID: 1BAD6F395338EFDE
7 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File

52
.env
Unescape View File

@ -12,7 +12,7 @@ PASSWORD=openIM123
# Endpoint for the MinIO object storage service. # Endpoint for the MinIO object storage service.
# Default: MINIO_ENDPOINT=http://172.28.0.1:10005 # Default: MINIO_ENDPOINT=http://172.28.0.1:10005
MINIO_ENDPOINT=http://172.29.0.1:10005 MINIO_ENDPOINT=http://172.21.0.1:10005
# Base URL for the application programming interface (API). # Base URL for the application programming interface (API).
# Default: API_URL=http://172.28.0.1:10002 # Default: API_URL=http://172.28.0.1:10002
@ -28,55 +28,55 @@ DATA_DIR=/root/workspaces/openim/openim-server
# Subnet for the Docker network. # Subnet for the Docker network.
# Default: DOCKER_BRIDGE_SUBNET=172.28.0.0/16 # Default: DOCKER_BRIDGE_SUBNET=172.28.0.0/16
DOCKER_BRIDGE_SUBNET=172.29.0.0/16 DOCKER_BRIDGE_SUBNET=172.21.0.0/16
# Gateway for the Docker network. # Gateway for the Docker network.
# Default: DOCKER_BRIDGE_GATEWAY=172.28.0.1 # Default: DOCKER_BRIDGE_GATEWAY=172.28.0.1
DOCKER_BRIDGE_GATEWAY=172.29.0.1 DOCKER_BRIDGE_GATEWAY=172.21.0.1
# Address or hostname for the MySQL network. # Address or hostname for the MySQL network.
# Default: MYSQL_NETWORK_ADDRESS=172.28.0.2 # Default: MYSQL_NETWORK_ADDRESS=172.28.0.2
MYSQL_NETWORK_ADDRESS=172.29.0.2 MYSQL_NETWORK_ADDRESS=172.21.0.2
# Address or hostname for the MongoDB network. # Address or hostname for the MongoDB network.
# Default: MONGO_NETWORK_ADDRESS=172.28.0.3 # Default: MONGO_NETWORK_ADDRESS=172.28.0.3
MONGO_NETWORK_ADDRESS=172.29.0.3 MONGO_NETWORK_ADDRESS=172.21.0.3
# Address or hostname for the Redis network. # Address or hostname for the Redis network.
# Default: REDIS_NETWORK_ADDRESS=172.28.0.4 # Default: REDIS_NETWORK_ADDRESS=172.28.0.4
REDIS_NETWORK_ADDRESS=172.29.0.4 REDIS_NETWORK_ADDRESS=172.21.0.4
# Address or hostname for the Kafka network. # Address or hostname for the Kafka network.
# Default: KAFKA_NETWORK_ADDRESS=172.28.0.5 # Default: KAFKA_NETWORK_ADDRESS=172.28.0.5
KAFKA_NETWORK_ADDRESS=172.29.0.5 KAFKA_NETWORK_ADDRESS=172.21.0.5
# Address or hostname for the ZooKeeper network. # Address or hostname for the ZooKeeper network.
# Default: ZOOKEEPER_NETWORK_ADDRESS=172.28.0.6 # Default: ZOOKEEPER_NETWORK_ADDRESS=172.28.0.6
ZOOKEEPER_NETWORK_ADDRESS=172.29.0.6 ZOOKEEPER_NETWORK_ADDRESS=172.21.0.6
# Address or hostname for the MinIO network. # Address or hostname for the MinIO network.
# Default: MINIO_NETWORK_ADDRESS=172.28.0.7 # Default: MINIO_NETWORK_ADDRESS=172.28.0.7
MINIO_NETWORK_ADDRESS=172.29.0.7 MINIO_NETWORK_ADDRESS=172.21.0.7
# Address or hostname for the OpenIM web network. # Address or hostname for the OpenIM web network.
# Default: OPENIM_WEB_NETWORK_ADDRESS=172.28.0.8 # Default: OPENIM_WEB_NETWORK_ADDRESS=172.28.0.8
OPENIM_WEB_NETWORK_ADDRESS=172.29.0.8 OPENIM_WEB_NETWORK_ADDRESS=172.21.0.8
# Address or hostname for the OpenIM server network. # Address or hostname for the OpenIM server network.
# Default: OPENIM_SERVER_NETWORK_ADDRESS=172.28.0.9 # Default: OPENIM_SERVER_NETWORK_ADDRESS=172.28.0.9
OPENIM_SERVER_NETWORK_ADDRESS=172.29.0.9 OPENIM_SERVER_NETWORK_ADDRESS=172.21.0.9
# Address or hostname for the OpenIM chat network. # Address or hostname for the OpenIM chat network.
# Default: OPENIM_CHAT_NETWORK_ADDRESS=172.28.0.10 # Default: OPENIM_CHAT_NETWORK_ADDRESS=172.28.0.10
OPENIM_CHAT_NETWORK_ADDRESS=172.29.0.10 OPENIM_CHAT_NETWORK_ADDRESS=172.21.0.10
# Address or hostname for the Prometheus network. # Address or hostname for the Prometheus network.
# Default: PROMETHEUS_NETWORK_ADDRESS=172.28.0.11 # Default: PROMETHEUS_NETWORK_ADDRESS=172.28.0.11
PROMETHEUS_NETWORK_ADDRESS=172.29.0.11 PROMETHEUS_NETWORK_ADDRESS=172.21.0.11
# Address or hostname for the Grafana network. # Address or hostname for the Grafana network.
# Default: GRAFANA_NETWORK_ADDRESS=172.28.0.12 # Default: GRAFANA_NETWORK_ADDRESS=172.28.0.12
GRAFANA_NETWORK_ADDRESS=172.29.0.12 GRAFANA_NETWORK_ADDRESS=172.21.0.12
# =============================================== # ===============================================
@ -87,7 +87,7 @@ GRAFANA_NETWORK_ADDRESS=172.29.0.12
# ----- ZooKeeper Configuration ----- # ----- ZooKeeper Configuration -----
# Address or hostname for the ZooKeeper service. # Address or hostname for the ZooKeeper service.
# Default: ZOOKEEPER_ADDRESS=172.28.0.1 # Default: ZOOKEEPER_ADDRESS=172.28.0.1
ZOOKEEPER_ADDRESS=172.29.0.6 ZOOKEEPER_ADDRESS=172.21.0.6
# Port for ZooKeeper service. # Port for ZooKeeper service.
# Default: ZOOKEEPER_PORT=12181 # Default: ZOOKEEPER_PORT=12181
@ -97,7 +97,7 @@ ZOOKEEPER_PORT=12181
# Address or hostname for the MySQL service. # Address or hostname for the MySQL service.
# Default: MYSQL_ADDRESS=172.28.0.1 # Default: MYSQL_ADDRESS=172.28.0.1
MYSQL_ADDRESS=172.29.0.2 MYSQL_ADDRESS=172.21.0.2
# Port on which MySQL database service is running. # Port on which MySQL database service is running.
# Default: MYSQL_PORT=13306 # Default: MYSQL_PORT=13306
@ -110,7 +110,7 @@ MYSQL_PASSWORD=openIM123
# ----- MongoDB Configuration ----- # ----- MongoDB Configuration -----
# Address or hostname for the MongoDB service. # Address or hostname for the MongoDB service.
# Default: MONGO_ADDRESS=172.28.0.1 # Default: MONGO_ADDRESS=172.28.0.1
MONGO_ADDRESS=172.29.0.3 MONGO_ADDRESS=172.21.0.3
# Port on which MongoDB service is running. # Port on which MongoDB service is running.
# Default: MONGO_PORT=37017 # Default: MONGO_PORT=37017
@ -131,7 +131,7 @@ MONGO_DATABASE=openIM_v3
# ----- Redis Configuration ----- # ----- Redis Configuration -----
# Address or hostname for the Redis service. # Address or hostname for the Redis service.
# Default: REDIS_ADDRESS=172.28.0.1 # Default: REDIS_ADDRESS=172.28.0.1
REDIS_ADDRESS=172.29.0.4 REDIS_ADDRESS=172.21.0.4
# Port on which Redis in-memory data structure store is running. # Port on which Redis in-memory data structure store is running.
# Default: REDIS_PORT=16379 # Default: REDIS_PORT=16379
@ -144,11 +144,11 @@ REDIS_PASSWORD=openIM123
# ----- Kafka Configuration ----- # ----- Kafka Configuration -----
# Address or hostname for the Kafka service. # Address or hostname for the Kafka service.
# Default: KAFKA_ADDRESS=172.28.0.1 # Default: KAFKA_ADDRESS=172.28.0.1
KAFKA_ADDRESS=172.29.0.5 KAFKA_ADDRESS=172.21.0.5
# Port on which Kafka distributed streaming platform is running. # Port on which Kafka distributed streaming platform is running.
# Default: KAFKA_PORT=19092 # Default: KAFKA_PORT=19092
KAFKA_PORT=19092 KAFKA_PORT=19094
# Topic in Kafka for storing the latest messages in Redis. # Topic in Kafka for storing the latest messages in Redis.
# Default: KAFKA_LATESTMSG_REDIS_TOPIC=latestMsgToRedis # Default: KAFKA_LATESTMSG_REDIS_TOPIC=latestMsgToRedis
@ -165,7 +165,7 @@ KAFKA_OFFLINEMSG_MONGO_TOPIC=offlineMsgToMongoMysql
# ----- MinIO Configuration ---- # ----- MinIO Configuration ----
# Address or hostname for the MinIO object storage service. # Address or hostname for the MinIO object storage service.
# Default: MINIO_ADDRESS=172.28.0.1 # Default: MINIO_ADDRESS=172.28.0.1
MINIO_ADDRESS=172.29.0.7 MINIO_ADDRESS=172.21.0.7
# Port on which MinIO object storage service is running. # Port on which MinIO object storage service is running.
# Default: MINIO_PORT=10005 # Default: MINIO_PORT=10005
@ -182,7 +182,7 @@ MINIO_SECRET_KEY=openIM123
# ----- Prometheus Configuration ----- # ----- Prometheus Configuration -----
# Address or hostname for the Prometheus service. # Address or hostname for the Prometheus service.
# Default: PROMETHEUS_ADDRESS=172.28.0.1 # Default: PROMETHEUS_ADDRESS=172.28.0.1
PROMETHEUS_ADDRESS=172.29.0.11 PROMETHEUS_ADDRESS=172.21.0.11
# Port on which Prometheus service is running. # Port on which Prometheus service is running.
# Default: PROMETHEUS_PORT=19090 # Default: PROMETHEUS_PORT=19090
@ -191,7 +191,7 @@ PROMETHEUS_PORT=19090
# ----- Grafana Configuration ----- # ----- Grafana Configuration -----
# Address or hostname for the Grafana service. # Address or hostname for the Grafana service.
# Default: GRAFANA_ADDRESS=172.28.0.1 # Default: GRAFANA_ADDRESS=172.28.0.1
GRAFANA_ADDRESS=172.29.0.12 GRAFANA_ADDRESS=172.21.0.12
# Port on which Grafana service is running. # Port on which Grafana service is running.
# Default: GRAFANA_PORT=3000 # Default: GRAFANA_PORT=3000
@ -211,7 +211,7 @@ OPENIM_WEB_PORT=11001
# Address or hostname for the OpenIM web service. # Address or hostname for the OpenIM web service.
# Default: OPENIM_WEB_ADDRESS=172.28.0.1 # Default: OPENIM_WEB_ADDRESS=172.28.0.1
OPENIM_WEB_ADDRESS=172.29.0.8 OPENIM_WEB_ADDRESS=172.21.0.8
# ====================================== # ======================================
@ -220,7 +220,7 @@ OPENIM_WEB_ADDRESS=172.29.0.8
# Address or hostname for the OpenIM server. # Address or hostname for the OpenIM server.
# Default: OPENIM_SERVER_ADDRESS=172.28.0.1 # Default: OPENIM_SERVER_ADDRESS=172.28.0.1
OPENIM_SERVER_ADDRESS=172.29.0.9 OPENIM_SERVER_ADDRESS=172.21.0.9
# Port for the OpenIM WebSockets. # Port for the OpenIM WebSockets.
# Default: OPENIM_WS_PORT=10001 # Default: OPENIM_WS_PORT=10001
@ -241,7 +241,7 @@ CHAT_BRANCH=main
# Address or hostname for the OpenIM chat service. # Address or hostname for the OpenIM chat service.
# Default: OPENIM_CHAT_ADDRESS=172.28.0.1 # Default: OPENIM_CHAT_ADDRESS=172.28.0.1
OPENIM_CHAT_ADDRESS=172.29.0.10 OPENIM_CHAT_ADDRESS=172.21.0.10
# Port for the OpenIM chat API. # Port for the OpenIM chat API.
# Default: OPENIM_CHAT_API_PORT=10008 # Default: OPENIM_CHAT_API_PORT=10008

12
config/config.yaml
Unescape View File

@ -28,7 +28,7 @@
# Zookeeper password # Zookeeper password
zookeeper: zookeeper:
schema: openim schema: openim
address: [ 172.29.0.1:12181 ] address: [ 172.21.0.1:12181 ]
username: '' username: ''
password: '' password: ''
@ -42,7 +42,7 @@ zookeeper:
# Log level: 1=slient, 2=error, 3=warn, 4=info # Log level: 1=slient, 2=error, 3=warn, 4=info
# Slow query threshold in milliseconds # Slow query threshold in milliseconds
mysql: mysql:
address: [ 172.29.0.1:13306 ] address: [ 172.21.0.1:13306 ]
username: root username: root
password: openIM123 password: openIM123
database: openIM_v3 database: openIM_v3
@ -61,7 +61,7 @@ mysql:
# Maximum connection pool size # Maximum connection pool size
mongo: mongo:
uri: '' uri: ''
address: [ 172.29.0.1:37017 ] address: [ 172.21.0.1:37017 ]
database: openIM_v3 database: openIM_v3
username: root username: root
password: openIM123 password: openIM123
@ -72,7 +72,7 @@ mongo:
# #
# Username is required only for Redis version 6.0+ # Username is required only for Redis version 6.0+
redis: redis:
address: [ 172.29.0.1:16379 ] address: [ 172.21.0.1:16379 ]
username: '' username: ''
password: openIM123 password: openIM123
@ -86,7 +86,7 @@ redis:
kafka: kafka:
username: '' username: ''
password: '' password: ''
addr: [ 172.29.0.1:19092 ] addr: [ 172.21.0.1:19094 ]
latestMsgToRedis: latestMsgToRedis:
topic: "latestMsgToRedis" topic: "latestMsgToRedis"
offlineMsgToMongo: offlineMsgToMongo:
@ -135,7 +135,7 @@ object:
apiURL: "http://14.153.6.114:10002" apiURL: "http://14.153.6.114:10002"
minio: minio:
bucket: "openim" bucket: "openim"
endpoint: "http://172.29.0.1:10005" endpoint: "http://172.21.0.1:10005"
accessKeyID: "root" accessKeyID: "root"
secretAccessKey: "openIM123" secretAccessKey: "openIM123"
sessionToken: '' sessionToken: ''

16
docker-compose.yml
Unescape View File

@ -110,26 +110,24 @@ services:
user: root user: root
restart: always restart: always
ports: ports:
- "${KAFKA_PORT}:9092" - "${KAFKA_PORT}:9094"
- "9093:9093"
- "9094:9094"
volumes: volumes:
- ./scripts/create_topic.sh:/opt/bitnami/kafka/create_topic.sh - ./scripts/create_topic.sh:/opt/bitnami/kafka/create_topic.sh
- ${DATA_DIR}/components/kafka:/bitnami/kafka - ${DATA_DIR}/components/kafka:/bitnami/kafka
command: > command: >
bash -c " bash -c "
/opt/bitnami/scripts/kafka/run.sh & sleep 5; /opt/bitnami/kafka/create_topic.sh; wait /opt/bitnami/scripts/kafka/run.sh & sleep 1; /opt/bitnami/kafka/create_topic.sh; wait
" "
extra_hosts: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
environment: environment:
- KAFKA_CFG_NODE_ID=0
- TZ=Asia/Shanghai - TZ=Asia/Shanghai
- KAFKA_CFG_NODE_ID=0
- KAFKA_CFG_PROCESS_ROLES=controller,broker - KAFKA_CFG_PROCESS_ROLES=controller,broker
- KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT - KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@<your_host>:9093
- KAFKA_CFG_ADVERTISED_LISTENERS=INSIDE://${KAFKA_NETWORK_ADDRESS}:9094,OUTSIDE://${KAFKA_NETWORK_ADDRESS}:9092 - KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093,EXTERNAL://:9094
- KAFKA_CFG_LISTENERS=PLAINTEXT://${KAFKA_NETWORK_ADDRESS}:9092,CONTROLLER://${KAFKA_NETWORK_ADDRESS}:9093,EXTERNAL://${KAFKA_NETWORK_ADDRESS}:9094 - KAFKA_CFG_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092,EXTERNAL://${DOCKER_BRIDGE_GATEWAY}:${KAFKA_PORT}
- KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093 - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT
- KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER - KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
networks: networks:
server: server:

2
scripts/install/environment.sh
Unescape View File

@ -206,7 +206,7 @@ def "REDIS_PASSWORD" "${PASSWORD}" # Redis的密码
###################### Kafka 配置信息 ###################### ###################### Kafka 配置信息 ######################
def "KAFKA_USERNAME" # `Kafka` 的用户名 def "KAFKA_USERNAME" # `Kafka` 的用户名
def "KAFKA_PASSWORD" # `Kafka` 的密码 def "KAFKA_PASSWORD" # `Kafka` 的密码
def "KAFKA_PORT" "19092" # `Kafka` 的端口 def "KAFKA_PORT" "19094" # `Kafka` 的端口
def "KAFKA_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # `Kafka` 的地址 def "KAFKA_ADDRESS" "${DOCKER_BRIDGE_GATEWAY}" # `Kafka` 的地址
def "KAFKA_LATESTMSG_REDIS_TOPIC" "latestMsgToRedis" # `Kafka` 的最新消息到Redis的主题 def "KAFKA_LATESTMSG_REDIS_TOPIC" "latestMsgToRedis" # `Kafka` 的最新消息到Redis的主题
def "KAFKA_OFFLINEMSG_MONGO_TOPIC" "offlineMsgToMongoMysql" # `Kafka` 的离线消息到Mongo的主题 def "KAFKA_OFFLINEMSG_MONGO_TOPIC" "offlineMsgToMongoMysql" # `Kafka` 的离线消息到Mongo的主题

2
scripts/install/openim-api.sh
Unescape View File

@ -53,7 +53,7 @@ function openim::api::start()
done done
# start all api services # start all api services
for ((i = 0; i < ${#OPENIM_API_SERVICE_LISTARIES[*]}; i++)); do for ((i = 0; i < ${#OPENIM_API_SERVICE_LISTARIES[*]}; i++)); do
openim::util::stop_services_with_name ${OPENIM_API_SERVICE_LISTARIES[$i]} openim::util::stop_services_on_ports ${OPENIM_API_PORT_LISTARIES[$i]}
openim::log::info "OpenIM ${OPENIM_API_SERVICE_LISTARIES[$i]} config path: ${OPENIM_API_CONFIG}" openim::log::info "OpenIM ${OPENIM_API_SERVICE_LISTARIES[$i]} config path: ${OPENIM_API_CONFIG}"
# Get the service and Prometheus ports. # Get the service and Prometheus ports.

2
scripts/install/openim-msggateway.sh
Unescape View File

@ -35,7 +35,7 @@ function openim::msggateway::start()
# OpenIM message gateway service port # OpenIM message gateway service port
OPENIM_MESSAGE_GATEWAY_PORTS=$(openim::util::list-to-string ${OPENIM_MESSAGE_GATEWAY_PORT} ) OPENIM_MESSAGE_GATEWAY_PORTS=$(openim::util::list-to-string ${OPENIM_MESSAGE_GATEWAY_PORT} )
read -a OPENIM_MSGGATEWAY_PORTS_ARRAY <<< ${OPENIM_MESSAGE_GATEWAY_PORTS} read -a OPENIM_MSGGATEWAY_PORTS_ARRAY <<< ${OPENIM_MESSAGE_GATEWAY_PORTS}
# OpenIM WS port # OpenIM WS port
OPENIM_WS_PORTS=$(openim::util::list-to-string ${OPENIM_WS_PORT} ) OPENIM_WS_PORTS=$(openim::util::list-to-string ${OPENIM_WS_PORT} )
read -a OPENIM_WS_PORTS_ARRAY <<< ${OPENIM_WS_PORTS} read -a OPENIM_WS_PORTS_ARRAY <<< ${OPENIM_WS_PORTS}

2
scripts/install/openim-rpc.sh
Unescape View File

@ -122,7 +122,7 @@ function openim::rpc::start() {
# start all rpc services # start all rpc services
for ((i = 0; i < ${#OPENIM_RPC_SERVICE_LISTARIES[*]}; i++)); do for ((i = 0; i < ${#OPENIM_RPC_SERVICE_LISTARIES[*]}; i++)); do
# openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES # openim::util::stop_services_with_name ${OPENIM_RPC_SERVICE_LISTARIES
openim::util::stop_services_on_ports {OPENIM_RPC_PORT_LISTARIES[$i]} openim::util::stop_services_on_ports ${OPENIM_RPC_PORT_LISTARIES[$i]}
openim::log::info "OpenIM ${OPENIM_RPC_SERVICE_LISTARIES[$i]} config path: ${OPENIM_RPC_CONFIG}" openim::log::info "OpenIM ${OPENIM_RPC_SERVICE_LISTARIES[$i]} config path: ${OPENIM_RPC_CONFIG}"
# Get the service and Prometheus ports. # Get the service and Prometheus ports.

Write Preview
Loading…
Cancel
Save