IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-04 09:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix config path file

Browse Source 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
Xinwei Xiong(cubxxw-openim)
2023-08-17 18:03:56 +08:00
parent a7a880787b
commit 292ce95abf
7 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/advertise.sh
+1 -1
View File
@@ -18,7 +18,7 @@ set -o pipefail
. $(dirname ${BASH_SOURCE})/lib/init.sh
openim::util::onCtrlC
trap 'openim::util::onCtrlC' INT
print_with_delay() {
text="$1"
scripts/docker_check_service.sh
+1 -6
View File
@@ -22,12 +22,7 @@ source "$SCRIPTS_ROOT/style_info.sh"
echo -e "${GREEN_PREFIX}=========> Check docker-compose status ${COLOR_SUFFIX} \n"
function openim::util::onCtrlC() {
kill -9 "${do_sth_pid}" "${progress_pid}" "${countdown_pid}"
echo
echo 'Ctrl+C is captured'
exit 1
}
cd "$OPENIM_ROOT"
scripts/install/environment.sh
+3 -3
View File
@@ -36,7 +36,7 @@ function def() {
}
# app要能访问到此ip和端口或域名
def "API_URL" "http://${IP}:10002/object/"
def "API_URL" "${IP}:10002/object/"
def "DATA_DIR" "${OPENIM_ROOT}"
# 设置统一的用户名，方便记忆
@@ -105,11 +105,11 @@ def "OBJECT_APIURL" "http://127.0.0.1:10002/object/" # 对
def "MINIO_BUCKET" "openim" # MinIO的存储桶名称
def "MINIO_PORT" "10005" # MinIO的端口
# MinIO的端点URL
readonly MINIO_ENDPOINT=${MINIO_ENDPOINT:-"http://${IP}:${MINIO_PORT}"}
readonly MINIO_ENDPOINT=${MINIO_ENDPOINT:-"${IP}:${MINIO_PORT}"}
def "MINIO_ACCESS_KEY" "${USER}" # MinIO的访问密钥ID
def "MINIO_SECRET_KEY" "${PASSWORD}" # MinIO的密钥
def "MINIO_SESSION_TOKEN" # MinIO的会话令牌
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # MinIO的会话令牌
readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址 # MinIO的会话令牌
def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com" # 腾讯云COS的存储桶URL
def "COS_SECRET_ID" # 腾讯云COS的密钥ID
def "COS_SECRET_KEY" # 腾讯云COS的密钥
scripts/lib/util.sh
+3 -4
View File
@@ -1212,11 +1212,10 @@ function openim::util::get_server_ip() {
echo "$IP"
}
function openim::util::onCtrlC () {
#Capture CTRL+C, terminate the background process of the program when the script is terminated in the form of ctrl+c
kill -9 ${do_sth_pid} ${progress_pid}
function openim::util::onCtrlC() {
kill -9 "${do_sth_pid}" "${progress_pid}" "${countdown_pid}"
echo
echo '!!! openim: Ctrl+C is captured'
echo 'Ctrl+C is captured'
exit 1
}