修改配置
This commit is contained in:
@@ -110,57 +110,42 @@ maxRetry: 10
|
||||
EOF
|
||||
success " mongodb.yml → ${MONGO_HOST}:${MONGO_PORT}/${MONGO_DATABASE}"
|
||||
|
||||
# minio.yml(标记已切换至 S3,实际由 openim-rpc-third.yml 控制)
|
||||
# minio.yml(Docker MinIO,与 openim-rpc-third object.enable: minio 配套)
|
||||
cat > "$OPENIM_CONF/minio.yml" <<EOF
|
||||
# 已切换为 Amazon S3,存储驱动由 openim-rpc-third.yml 中 object.enable: aws 控制
|
||||
bucket: ${OPENIM_AWS_BUCKET}
|
||||
accessKeyID: ${OPENIM_AWS_ACCESS_KEY_ID}
|
||||
secretAccessKey: ${OPENIM_AWS_SECRET_ACCESS_KEY}
|
||||
bucket: ${MINIO_BUCKET}
|
||||
accessKeyID: ${MINIO_ROOT_USER}
|
||||
secretAccessKey: ${MINIO_ROOT_PASSWORD}
|
||||
sessionToken:
|
||||
internalAddress: s3.${OPENIM_AWS_REGION}.amazonaws.com
|
||||
externalAddress: https://s3.${OPENIM_AWS_REGION}.amazonaws.com
|
||||
publicRead: ${OPENIM_AWS_PUBLIC_READ}
|
||||
internalAddress: ${MINIO_INTERNAL_ADDRESS}
|
||||
externalAddress: ${MINIO_EXTERNAL_ADDRESS}
|
||||
publicRead: ${MINIO_PUBLIC_READ}
|
||||
EOF
|
||||
success " minio.yml → S3 (${OPENIM_AWS_REGION})"
|
||||
success " minio.yml → MinIO bucket=${MINIO_BUCKET} external=${MINIO_EXTERNAL_ADDRESS}"
|
||||
|
||||
# openim-rpc-third.yml — 切换 enable: aws,更新凭证
|
||||
# openim-rpc-third.yml — 切换 enable: minio(凭证在 minio.yml)
|
||||
THIRD_CONF="$OPENIM_CONF/openim-rpc-third.yml"
|
||||
if [[ -f "$THIRD_CONF" ]]; then
|
||||
cp "$THIRD_CONF" "${THIRD_CONF}.bak"
|
||||
|
||||
python3 - "$THIRD_CONF" <<PYEOF
|
||||
python3 - "$THIRD_CONF" <<'PYEOF'
|
||||
import re, sys
|
||||
|
||||
path = sys.argv[1]
|
||||
with open(path) as f:
|
||||
content = f.read()
|
||||
|
||||
# 只替换 object: 块下的 enable: 字段,避免误改 prometheus/ratelimiter/circuitBreaker 的布尔值
|
||||
content = re.sub(r'(^object:.*?\n enable:\s*)\S+', r'\1aws', content, count=1, flags=re.MULTILINE | re.DOTALL)
|
||||
|
||||
endpoint_line = ""
|
||||
endpoint_val = "${OPENIM_AWS_ENDPOINT:-}"
|
||||
if endpoint_val:
|
||||
endpoint_line = f" endpoint: {endpoint_val}\n"
|
||||
|
||||
new_aws = f""" aws:
|
||||
{endpoint_line} region: ${OPENIM_AWS_REGION}
|
||||
bucket: ${OPENIM_AWS_BUCKET}
|
||||
accessKeyID: ${OPENIM_AWS_ACCESS_KEY_ID}
|
||||
secretAccessKey: ${OPENIM_AWS_SECRET_ACCESS_KEY}
|
||||
sessionToken:
|
||||
publicRead: ${OPENIM_AWS_PUBLIC_READ}"""
|
||||
|
||||
content = re.sub(
|
||||
r'(\s{{2}}aws:\n(?:[ \t]+\S[^\n]*\n?)*)',
|
||||
'\n' + new_aws + '\n',
|
||||
content
|
||||
r'(^object:.*?\n enable:\s*)\S+',
|
||||
r'\1minio',
|
||||
content,
|
||||
count=1,
|
||||
flags=re.MULTILINE | re.DOTALL,
|
||||
)
|
||||
|
||||
with open(path, 'w') as f:
|
||||
f.write(content)
|
||||
PYEOF
|
||||
success " openim-rpc-third.yml → enable: aws, bucket=${OPENIM_AWS_BUCKET} (备份: .bak)"
|
||||
success " openim-rpc-third.yml → enable: minio (备份: .bak)"
|
||||
else
|
||||
warn " openim-rpc-third.yml 不存在,跳过"
|
||||
fi
|
||||
@@ -520,8 +505,8 @@ echo " Etcd → 127.0.0.1:${ETCD_PORT} (Docker)"
|
||||
echo " MongoDB → ${MONGO_HOST}:${MONGO_PORT} DB(openim)=${MONGO_DATABASE} DB(build)=${BUILD_MONGO_DATABASE}"
|
||||
echo " LiveKit → ${LIVEKIT_URL} node_ip=${LIVEKIT_NODE_IP} key=${LIVEKIT_API_KEY}"
|
||||
echo " Tencent RTC → sdk_app_id=${TENCENT_SDK_APP_ID}"
|
||||
echo " S3 (openim) → s3://${OPENIM_AWS_BUCKET} region=${OPENIM_AWS_REGION}"
|
||||
echo " S3 (build) → s3://${BUILD_AWS_BUCKET} region=${BUILD_AWS_REGION}"
|
||||
echo " MinIO (openim) → bucket=${MINIO_BUCKET} API=${MINIO_INTERNAL_ADDRESS} 外网=${MINIO_EXTERNAL_ADDRESS}"
|
||||
echo " S3 (build) → s3://${BUILD_AWS_BUCKET} region=${BUILD_AWS_REGION}"
|
||||
echo " MeetingMsg → webhook afterSendGroupMsg=enabled → 127.0.0.1:8000"
|
||||
echo " MeetingH5 → ws=${DEPLOY_TEST_IP}:8000, liveApi=${DEPLOY_TEST_IP}:8081"
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user