mirror of
https://github.com/minio/minio.git
synced 2025-10-30 00:05:02 -04:00
da532ab93d
Commit b6eb8dff649b0f46c12d24e89aa11254fb0132fa renamed compression setting environment variables to follow consistent style. Although it preserved backward compatibility for the most part (i.e. it handled MINIO_COMPRESS_ALLOW_ENCRYPTION, MINIO_COMPRESS_EXTENSIONS, and MINIO_COMPRESS_MIME_TYPES), MINIO_COMPRESS_ENABLE was left behind. Additionally, due to incorrect fallback ordering, and DefaultKVS containing enable=off allow_encryption=off (so kvs.Get should've been tried last), that commit broke MINIO_COMPRESS_ALLOW_ENCRYPTION (even though it appeared to be handled), and even older MINIO_COMPRESS, too. The legacy MIME types and extensions variables take precedence over both config and new variables, so they don't need fixing.
60 lines
1.9 KiB
Go
60 lines
1.9 KiB
Go
// Copyright (c) 2015-2021 MinIO, Inc.
|
|
//
|
|
// This file is part of MinIO Object Storage stack
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// This program is distributed in the hope that it will be useful
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package compress
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/minio/minio/internal/config"
|
|
)
|
|
|
|
// Legacy envs.
|
|
const (
|
|
EnvCompress = "MINIO_COMPRESS"
|
|
EnvCompressMimeTypesLegacy1 = "MINIO_COMPRESS_MIMETYPES"
|
|
|
|
// These envs were wrong but we supported them for a long time
|
|
// so keep them here to support existing deployments.
|
|
EnvCompressEnableLegacy = "MINIO_COMPRESS_ENABLE"
|
|
EnvCompressAllowEncryptionLegacy = "MINIO_COMPRESS_ALLOW_ENCRYPTION"
|
|
EnvCompressExtensionsLegacy = "MINIO_COMPRESS_EXTENSIONS"
|
|
EnvCompressMimeTypesLegacy2 = "MINIO_COMPRESS_MIME_TYPES"
|
|
)
|
|
|
|
// SetCompressionConfig - One time migration code needed, for migrating from older config to new for Compression.
|
|
func SetCompressionConfig(s config.Config, cfg Config) {
|
|
if !cfg.Enabled {
|
|
// No need to save disabled settings in new config.
|
|
return
|
|
}
|
|
s[config.CompressionSubSys][config.Default] = config.KVS{
|
|
config.KV{
|
|
Key: config.Enable,
|
|
Value: config.EnableOn,
|
|
},
|
|
config.KV{
|
|
Key: Extensions,
|
|
Value: strings.Join(cfg.Extensions, config.ValueSeparator),
|
|
},
|
|
config.KV{
|
|
Key: MimeTypes,
|
|
Value: strings.Join(cfg.MimeTypes, config.ValueSeparator),
|
|
},
|
|
}
|
|
}
|