diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-01-02 09:57:06 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-01-02 09:57:06 +0000 |
| commit | a17fad97b453cc31ebeb4591cce01c0bc9f9a8ec (patch) | |
| tree | e4a44ef1f3ebaf9c60c9c23088f8d52e22b8baf7 | |
| parent | ac35636f4ad92a2f3080af556ad8cfadf73ce977 (diff) | |
| parent | 9131fb560f2d4232d4b4890baef4d926ad35a6f8 (diff) | |
| download | gitlab-ce-a17fad97b453cc31ebeb4591cce01c0bc9f9a8ec.tar.gz | |
Merge branch 'change-asset-sync-env-variables' into 'master'
Rename asset sync related AWS variables
See merge request gitlab-org/gitlab-ce!16154
| -rw-r--r-- | config/initializers/asset_sync.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/asset_sync.rb b/config/initializers/asset_sync.rb index db8500f6231..7f3934853fa 100644 --- a/config/initializers/asset_sync.rb +++ b/config/initializers/asset_sync.rb @@ -14,8 +14,8 @@ AssetSync.configure do |config| config.fog_directory = ENV['FOG_DIRECTORY'] if ENV.has_key?('FOG_DIRECTORY') config.fog_region = ENV['FOG_REGION'] if ENV.has_key?('FOG_REGION') - config.aws_access_key_id = ENV['AWS_ACCESS_KEY_ID'] if ENV.has_key?('AWS_ACCESS_KEY_ID') - config.aws_secret_access_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('AWS_SECRET_ACCESS_KEY') + config.aws_access_key_id = ENV['ASSETS_AWS_ACCESS_KEY_ID'] if ENV.has_key?('ASSETS_AWS_ACCESS_KEY_ID') + config.aws_secret_access_key = ENV['ASSETS_AWS_SECRET_ACCESS_KEY'] if ENV.has_key?('ASSETS_AWS_SECRET_ACCESS_KEY') config.aws_reduced_redundancy = ENV['AWS_REDUCED_REDUNDANCY'] == true if ENV.has_key?('AWS_REDUCED_REDUNDANCY') config.rackspace_username = ENV['RACKSPACE_USERNAME'] if ENV.has_key?('RACKSPACE_USERNAME') |