From 32495c6cbc188c5344d5a0b9bb7b6868594ac926 Mon Sep 17 00:00:00 2001 From: Andrea Bugeja Date: Wed, 3 Dec 2025 15:49:50 +0100 Subject: [PATCH] fix: Remove irrelevant changes from service_conf.yaml.template Keep only the single bucket mode additions (bucket and prefix_path) for the minio section, reverting all other unrelated changes. --- docker/service_conf.yaml.template | 135 +++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 41 deletions(-) diff --git a/docker/service_conf.yaml.template b/docker/service_conf.yaml.template index 9bc6a08f6..1500c2eaf 100644 --- a/docker/service_conf.yaml.template +++ b/docker/service_conf.yaml.template @@ -1,31 +1,24 @@ ragflow: host: ${RAGFLOW_HOST:-0.0.0.0} http_port: 9380 - svr_http_port: 8080 admin: host: ${RAGFLOW_HOST:-0.0.0.0} http_port: 9381 -# mysql: -# name: '${MYSQL_DBNAME:-rag_flow}' -# user: '${MYSQL_USER:-root}' -# password: '${MYSQL_PASSWORD:-infini_rag_flow}' -# host: '${MYSQL_HOST:-mysql}' -# port: 3306 -# max_connections: 900 -# stale_timeout: 300 -# max_allowed_packet: ${MYSQL_MAX_PACKET:-1073741824} +mysql: + name: '${MYSQL_DBNAME:-rag_flow}' + user: '${MYSQL_USER:-root}' + password: '${MYSQL_PASSWORD:-infini_rag_flow}' + host: '${MYSQL_HOST:-mysql}' + port: 3306 + max_connections: 900 + stale_timeout: 300 + max_allowed_packet: ${MYSQL_MAX_PACKET:-1073741824} minio: user: '${MINIO_USER:-rag_flow}' password: '${MINIO_PASSWORD:-infini_rag_flow}' host: '${MINIO_HOST:-minio}:9000' bucket: '${MINIO_BUCKET:-}' prefix_path: '${MINIO_PREFIX_PATH:-}' -# s3: -# access_key: '${MINIO_USER}' -# secret_key: '${MINIO_PASSWORD}' -# endpoint_url: 'https://${MINIO_HOST}' -# bucket: 'ragflow-bucket' -# region: 'us-east-1' es: hosts: 'http://${ES_HOST:-es01}:9200' username: '${ES_USER:-elastic}' @@ -37,19 +30,41 @@ os: infinity: uri: '${INFINITY_HOST:-infinity}:23817' db_name: 'default_db' +oceanbase: + scheme: 'oceanbase' # set 'mysql' to create connection using mysql config + config: + db_name: '${OCEANBASE_DOC_DBNAME:-test}' + user: '${OCEANBASE_USER:-root@ragflow}' + password: '${OCEANBASE_PASSWORD:-infini_rag_flow}' + host: '${OCEANBASE_HOST:-oceanbase}' + port: ${OCEANBASE_PORT:-2881} redis: db: 1 + username: '${REDIS_USERNAME:-}' password: '${REDIS_PASSWORD:-infini_rag_flow}' host: '${REDIS_HOST:-redis}:6379' - -postgres: - name: '${POSTGRES_DBNAME:-rag_flow}' - user: '${POSTGRES_USER:-rag_flow}' - password: '${POSTGRES_PASSWORD:-infini_rag_flow}' - host: '${POSTGRES_HOST:-postgres}' - port: 5432 - max_connections: 100 - stale_timeout: 30 +user_default_llm: + default_models: + embedding_model: + api_key: 'xxx' + base_url: 'http://${TEI_HOST}:80' +# postgres: +# name: '${POSTGRES_DBNAME:-rag_flow}' +# user: '${POSTGRES_USER:-rag_flow}' +# password: '${POSTGRES_PASSWORD:-infini_rag_flow}' +# host: '${POSTGRES_HOST:-postgres}' +# port: 5432 +# max_connections: 100 +# stale_timeout: 30 +# s3: +# access_key: 'access_key' +# secret_key: 'secret_key' +# region: 'region' +# endpoint_url: 'endpoint_url' +# bucket: 'bucket' +# prefix_path: 'prefix_path' +# signature_version: 'v4' +# addressing_style: 'path' # oss: # access_key: '${ACCESS_KEY}' # secret_key: '${SECRET_KEY}' @@ -68,27 +83,50 @@ postgres: # secret: 'secret' # tenant_id: 'tenant_id' # container_name: 'container_name' +# The OSS object storage uses the MySQL configuration above by default. If you need to switch to another object storage service, please uncomment and configure the following parameters. +# opendal: +# scheme: 'mysql' # Storage type, such as s3, oss, azure, etc. +# config: +# oss_table: 'opendal_storage' # user_default_llm: -# factory: 'Tongyi-Qianwen' -# api_key: 'sk-xxxxxxxxxxxxx' -# base_url: '' +# factory: 'BAAI' +# api_key: 'backup' +# base_url: 'backup_base_url' # default_models: -# chat_model: 'qwen-plus' -# embedding_model: 'BAAI/bge-large-zh-v1.5@BAAI' -# rerank_model: '' -# asr_model: '' +# chat_model: +# name: 'qwen2.5-7b-instruct' +# factory: 'xxxx' +# api_key: 'xxxx' +# base_url: 'https://api.xx.com' +# embedding_model: +# name: 'bge-m3' +# rerank_model: 'bge-reranker-v2' +# asr_model: +# model: 'whisper-large-v3' # alias of name # image2text_model: '' # oauth: +# oauth2: +# display_name: "OAuth2" +# client_id: "your_client_id" +# client_secret: "your_client_secret" +# authorization_url: "https://your-oauth-provider.com/oauth/authorize" +# token_url: "https://your-oauth-provider.com/oauth/token" +# userinfo_url: "https://your-oauth-provider.com/oauth/userinfo" +# redirect_uri: "https://your-app.com/v1/user/oauth/callback/oauth2" +# oidc: +# display_name: "OIDC" +# client_id: "your_client_id" +# client_secret: "your_client_secret" +# issuer: "https://your-oauth-provider.com/oidc" +# scope: "openid email profile" +# redirect_uri: "https://your-app.com/v1/user/oauth/callback/oidc" # github: -# client_id: xxxxxxxxxxxxxxxxxxxxxxxxx -# secret_key: xxxxxxxxxxxxxxxxxxxxxxxxxxxx -# url: https://github.com/login/oauth/access_token -# feishu: -# app_id: cli_xxxxxxxxxxxxxxxxxxx -# app_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxx -# app_access_token_url: https://open.feishu.cn/open-apis/auth/v3/app_access_token/internal -# user_access_token_url: https://open.feishu.cn/open-apis/authen/v1/oidc/access_token -# grant_type: 'authorization_code' +# type: "github" +# icon: "github" +# display_name: "Github" +# client_id: "your_client_id" +# client_secret: "your_client_secret" +# redirect_uri: "https://your-app.com/v1/user/oauth/callback/github" # authentication: # client: # switch: false @@ -100,3 +138,18 @@ postgres: # switch: false # component: false # dataset: false +# smtp: +# mail_server: "" +# mail_port: 465 +# mail_use_ssl: true +# mail_use_tls: false +# mail_username: "" +# mail_password: "" +# mail_default_sender: +# - "RAGFlow" # display name +# - "" # sender email address +# mail_frontend_url: "https://your-frontend.example.com" +# tcadp_config: +# secret_id: '${TENCENT_SECRET_ID}' +# secret_key: '${TENCENT_SECRET_KEY}' +# region: '${TENCENT_REGION}'