From d3a2040384b4990690aa3b4f56682c5ee7fb0010 Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Fri, 15 Sep 2023 16:27:27 +0800
Subject: [PATCH] s3 public read

---
 .env                              | 4 ----
 deployments/templates/openim.yaml | 3 ---
 scripts/install/environment.sh    | 3 ---
 3 files changed, 10 deletions(-)

diff --git a/.env b/.env
index 0e16e8ef3..2f2766ef6 100644
--- a/.env
+++ b/.env
@@ -193,10 +193,6 @@ MINIO_ACCESS_KEY=root
 # Default: MINIO_SECRET_KEY=openIM123
 MINIO_SECRET_KEY=openIM123
 
-# Public Read public reading bucket
-# Default: MINIO_PUBLIC_READ=false
-MINIO_PUBLIC_READ=false
-
 # ----- Prometheus Configuration -----
 # Address or hostname for the Prometheus service.
 # Default: PROMETHEUS_ADDRESS=172.28.0.1
diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml
index 053603a40..9465ea872 100644
--- a/deployments/templates/openim.yaml
+++ b/deployments/templates/openim.yaml
@@ -140,13 +140,11 @@ object:
     secretAccessKey: "${MINIO_SECRET_KEY}"
     sessionToken: ${MINIO_SESSION_TOKEN}
     signEndpoint: "${MINIO_SIGN_ENDPOINT}"
-    publicRead: "${MINIO_PUBLIC_READ}"
   cos:
     bucketURL: ${COS_BUCKET_URL}
     secretID: ${COS_SECRET_ID}
     secretKey: ${COS_SECRET_KEY}
     sessionToken: ${COS_SESSION_TOKEN}
-    publicRead: ${COS_PUBLIC_READ}
   oss:
     endpoint: "${OSS_ENDPOINT}"
     bucket: "${OSS_BUCKET}"
@@ -154,7 +152,6 @@ object:
     accessKeyID: ${OSS_ACCESS_KEY_ID}
     accessKeySecret: ${OSS_ACCESS_KEY_SECRET}
     sessionToken: ${OSS_SESSION_TOKEN}
-    publicRead: ${OSS_PUBLIC_READ}
 
 
 ###################### RPC Port Configuration ######################
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index ff2fc1913..b17570be5 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -186,20 +186,17 @@ def "MINIO_ACCESS_KEY" "${USER}"
 def "MINIO_SECRET_KEY" "${PASSWORD}"                                              # MinIO的密钥
 def "MINIO_SESSION_TOKEN"                                                         # MinIO的会话令牌
 readonly MINIO_SIGN_ENDPOINT=${MINIO_SIGN_ENDPOINT:-"http://${IP}:${MINIO_PORT}"} # signEndpoint为minio公网地址
-readonly MINIO_PUBLIC_READ=${MINIO_PUBLIC_READ}                                   # publicRead为true表示允许公共读
 # 腾讯云COS的存储桶URL
 def "COS_BUCKET_URL" "https://temp-1252357374.cos.ap-chengdu.myqcloud.com"
 def "COS_SECRET_ID"                                                     # 腾讯云COS的密钥ID
 def "COS_SECRET_KEY"                                                    # 腾讯云COS的密钥
 def "COS_SESSION_TOKEN"                                                 # 腾讯云COS的会话令牌
-def "COS_PUBLIC_READ" false                                             # 腾讯云COS的公有读
 def "OSS_ENDPOINT" "https://oss-cn-chengdu.aliyuncs.com"                # 阿里云OSS的端点URL
 def "OSS_BUCKET" "demo-9999999"                                         # 阿里云OSS的存储桶名称
 def "OSS_BUCKET_URL" "https://demo-9999999.oss-cn-chengdu.aliyuncs.com" # 阿里云OSS的存储桶URL
 def "OSS_ACCESS_KEY_ID"                                                 # 阿里云OSS的访问密钥ID
 def "OSS_ACCESS_KEY_SECRET"                                             # 阿里云OSS的密钥
 def "OSS_SESSION_TOKEN"                                                 # 阿里云OSS的会话令牌
-def "OSS_PUBLIC_READ" false                                             # 阿里云OSS的公有读
 
 ###################### Redis 配置信息 ######################
 def "REDIS_PORT" "16379"                                    # Redis的端口