From 7522594b85fef6ec8faae9bce2ed5339afb75a22 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 4 Apr 2019 11:54:11 +0100
Subject: [PATCH] Fix outdated db2fog initializer

---
 .gitignore                                 |  1 -
 config/initializers/0_depricated_db2fog.rb | 15 ---------------
 config/initializers/db2fog.rb              |  7 +++++++
 3 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 config/initializers/0_depricated_db2fog.rb
 create mode 100644 config/initializers/db2fog.rb

diff --git a/.gitignore b/.gitignore
index 21ff15e147..88a12db1be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,6 @@ public/images
 public/spree
 config/abr.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
deleted file mode 100644
index f2a2e76bc9..0000000000
--- a/config/initializers/0_depricated_db2fog.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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
new file mode 100644
index 0000000000..84a1d4098d
--- /dev/null
+++ b/config/initializers/db2fog.rb
@@ -0,0 +1,7 @@
+# See: https://github.com/yob/db2fog
+DB2Fog.config = {
+    :aws_access_key_id     => Spree::Config[:s3_access_key],
+    :aws_secret_access_key => Spree::Config[:s3_secret],
+    :directory             => Spree::Config[:s3_backups_bucket],
+    :provider              => 'AWS'
+}