From d0a9174d55fe39f6c1dcbec9df684aeea691b21d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 22 Jul 2017 09:39:42 -0500
Subject: Move storage_services.yml to config for consistency

---
 config/storage_services.yml             | 27 +++++++++++++++++++++++++++
 lib/active_storage/storage_services.yml | 27 ---------------------------
 lib/tasks/activestorage.rake            |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 config/storage_services.yml
 delete mode 100644 lib/active_storage/storage_services.yml

diff --git a/config/storage_services.yml b/config/storage_services.yml
new file mode 100644
index 0000000000..c80a3e8453
--- /dev/null
+++ b/config/storage_services.yml
@@ -0,0 +1,27 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails secrets:edit to set the AWS secrets (as shared:aws:access_key_id|secret_access_key)
+amazon:
+  service: S3
+  access_key_id: <%= Rails.application.secrets.dig(:aws, :access_key_id) %>
+  secret_access_key: <%= Rails.application.secrets.dig(:aws, :secret_access_key) %>
+  region: us-east-1
+  bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+google:
+  service: GCS
+  project: your_project
+  keyfile: <%= Rails.root.join("path/to/gcs.keyfile") %>
+  bucket: your_own_bucket
+
+mirror:
+  service: Mirror
+  primary: local
+  mirrors: [ amazon, google ]
diff --git a/lib/active_storage/storage_services.yml b/lib/active_storage/storage_services.yml
deleted file mode 100644
index c80a3e8453..0000000000
--- a/lib/active_storage/storage_services.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-test:
-  service: Disk
-  root: <%= Rails.root.join("tmp/storage") %>
-
-local:
-  service: Disk
-  root: <%= Rails.root.join("storage") %>
-
-# Use rails secrets:edit to set the AWS secrets (as shared:aws:access_key_id|secret_access_key)
-amazon:
-  service: S3
-  access_key_id: <%= Rails.application.secrets.dig(:aws, :access_key_id) %>
-  secret_access_key: <%= Rails.application.secrets.dig(:aws, :secret_access_key) %>
-  region: us-east-1
-  bucket: your_own_bucket
-
-# Remember not to checkin your GCS keyfile to a repository
-google:
-  service: GCS
-  project: your_project
-  keyfile: <%= Rails.root.join("path/to/gcs.keyfile") %>
-  bucket: your_own_bucket
-
-mirror:
-  service: Mirror
-  primary: local
-  mirrors: [ amazon, google ]
diff --git a/lib/tasks/activestorage.rake b/lib/tasks/activestorage.rake
index ea83707224..2fba4eaa8d 100644
--- a/lib/tasks/activestorage.rake
+++ b/lib/tasks/activestorage.rake
@@ -7,7 +7,7 @@ namespace :activestorage do
     FileUtils.mkdir_p Rails.root.join("tmp/storage")
     puts "Made storage and tmp/storage directories for development and testing"
 
-    FileUtils.cp File.expand_path("../../active_storage/storage_services.yml", __FILE__), Rails.root.join("config")
+    FileUtils.cp File.expand_path("../../../config/storage_services.yml", __FILE__), Rails.root.join("config")
     puts "Copied default configuration to config/storage_services.yml"
 
     migration_file_path = "db/migrate/#{Time.now.utc.strftime("%Y%m%d%H%M%S")}_active_storage_create_tables.rb"
-- 
cgit v1.2.3