add storage class, del legacy

This commit is contained in:
2023-10-15 18:54:30 +07:00
parent f7312738ef
commit 2bdb9fde2e
14 changed files with 7 additions and 301 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
source lib/lib.sh
ENVS=(PROJECT_NAME DBTYPE DBHOST DBUSER DBPASS DBTABLE STORAGE_HOST STORAGE_REGION STORAGE_PATH ACCOUNT_ID APPLICATION_KEY)
ENVS=(PROJECT_NAME DBTYPE DBHOST DBUSER DBPASS DBTABLE STORAGE_HOST STORAGE_PATH ACCOUNT_ID APPLICATION_KEY)
for ENV in "${ENVS[@]}"; do
if [[ -z "${!ENV+x}" ]]; then
+1
View File
@@ -3,3 +3,4 @@ S3_HOST_BASE=s3.amegaserver.com
S3_REGION=ru-nsk
S3_ACCOUNT_ID=
S3_APPLICATION_KEY=
S3_STORAGE_CLASS=
+3 -1
View File
@@ -4,6 +4,7 @@ S3_HOST_BASE=${STORAGE_HOST:-s3.amazonaws.com}
S3_REGION=${STORAGE_REGION:-''}
S3_REMOTE_DIR=${STORAGE_PATH#*/}
S3_BUCKET=${STORAGE_PATH%%/*}
S3_STORAGE_CLASS=${STORAGE_CLASS:-STANDARD_IA}
# Добавляем в конце '/'
if [[ -n "${S3_REMOTE_DIR}" ]] && [[ ${S3_REMOTE_DIR} != */ ]]; then S3_REMOTE_DIR="${S3_REMOTE_DIR}/"; fi
@@ -30,6 +31,7 @@ storage_login() {
echo S3_HOST_BASE=${S3_HOST_BASE} >> .env
echo S3_ACCOUNT_ID=${ACCOUNT_ID} >> .env
echo S3_APPLICATION_KEY=${APPLICATION_KEY} >> .env
echo S3_STORAGE_CLASS=${S3_STORAGE_CLASS} >> .env
mkdir -p /root/.config/rclone
mo -s=.env -u /usr/local/sbin/storage/s3.template > ${config}
@@ -44,6 +46,6 @@ storage_upload() {
[ -z ${S3_CONNECTION} ] && storage_login
log "Upload \"${ARCHIVE}\" \n\t as \"${S3_ARCHIVE}\" in \"${S3_BUCKET}\""
rclone copy --progress --transfers=5 --update --s3-chunk-size=${CHUNK_SIZE:-100m} ${ARCHIVE} s3:/${S3_BUCKET}/${S3_ARCHIVE}
rclone copy --progress --transfers=5 --update --s3-chunk-size=${CHUNK_SIZE:-500m} ${ARCHIVE} s3:/${S3_BUCKET}/${S3_ARCHIVE}
return $?
}
@@ -6,3 +6,4 @@ access_key_id = {{S3_ACCOUNT_ID}}
secret_access_key = {{S3_APPLICATION_KEY}}
region = {{S3_REGION}}
endpoint = https://{{S3_HOST_BASE}}
storage_class = {{S3_STORAGE_CLASS}}