From 2ea1a596664ae28d1feee6b9a7b4ef88b881dbfa Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 9 Oct 2015 15:03:50 +1100 Subject: [PATCH] depricating db2fog.rb initializer due to invalid bucket name Once everybody changed their server config, we can remove that file. --- .gitignore | 1 + config/initializers/0_depricated_db2fog.rb | 15 +++++++++++++++ config/initializers/db2fog.rb | 6 ------ 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 config/initializers/0_depricated_db2fog.rb delete mode 100644 config/initializers/db2fog.rb diff --git a/.gitignore b/.gitignore index f465ad7306..42107a8e2e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ config/abr.yml config/heroku_env.rb config/newrelic.yml config/initializers/feature_toggle.rb +config/initializers/db2fog.rb NERD_tree* coverage libpeerconnection.log diff --git a/config/initializers/0_depricated_db2fog.rb b/config/initializers/0_depricated_db2fog.rb new file mode 100644 index 0000000000..f2a2e76bc9 --- /dev/null +++ b/config/initializers/0_depricated_db2fog.rb @@ -0,0 +1,15 @@ +# Depricated: this initializer contains an invalid bucket name. +# Users of DB2fog should be able to configure DB2fog without changing the code. +# +# Name your configuration file `db2fog.rb`. It will be ignored by git. +# And it will overwrite this depricated configuration. +# +# See: https://github.com/yob/db2fog +# +# TODO: Remove this file in a future release. +DB2Fog.config = { + :aws_access_key_id => Spree::Config[:s3_access_key], + :aws_secret_access_key => Spree::Config[:s3_secret], + :directory => "db-backup_#{Spree::Config[:s3_bucket]}", + :provider => 'AWS' +} diff --git a/config/initializers/db2fog.rb b/config/initializers/db2fog.rb deleted file mode 100644 index 4c02b5dbcc..0000000000 --- a/config/initializers/db2fog.rb +++ /dev/null @@ -1,6 +0,0 @@ -DB2Fog.config = { - :aws_access_key_id => Spree::Config[:s3_access_key], - :aws_secret_access_key => Spree::Config[:s3_secret], - :directory => "db-backup_#{Spree::Config[:s3_bucket]}", - :provider => 'AWS' -}