Skip to content

Commit ea0365b

Browse files
Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release
# Conflicts: # config/usualConfig.yaml
1 parent f8ca38b commit ea0365b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.env

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
USER=root
22
PASSWORD=openIM123
3-
MINIO_ENDPOINT=127.0.0.1:10005
3+
MINIO_ENDPOINT=http://127.0.0.1:10005
44
DATA_DIR=./

script/init_pwd.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ echo "your user is:$USER"
55
echo "your password is:$PASSWORD"
66
echo "your minio endPoint:$MINIO_ENDPOINT"
77

8-
sed -i "/^\([[:space:]]*dbMysqlUserName: *\).*/s//\1$USER/;/\([[:space:]]*dbUserName: *\).*/s//\1$USER/;/\([[:space:]]*accessKeyID: *\).*/s//\1$USER/;/\([[:space:]]*endpoint: *\).*/s//\1$MINIO_ENDPOINT/;" ../config/usualConfig.yaml
8+
sed -i "/^\([[:space:]]*dbMysqlUserName: *\).*/s//\1$USER/;/\([[:space:]]*dbUserName: *\).*/s//\1$USER/;/\([[:space:]]*accessKeyID: *\).*/s//\1$USER/;/\([[:space:]]*endpoint: *\).*/s//\1\"$MINIO_ENDPOINT\"/;" ../config/usualConfig.yaml
99
sed -i "/^\([[:space:]]*dbMysqlPassword: *\).*/s//\1$PASSWORD/;/\([[:space:]]*dbPassword: *\).*/s//\1$PASSWORD/;/\([[:space:]]*dbPassWord: *\).*/s//\1$PASSWORD/;/\([[:space:]]*secretAccessKey: *\).*/s//\1$PASSWORD/;" ../config/usualConfig.yaml

0 commit comments

Comments
 (0)