From 087e1e3565072fb04756ab01664b83a183477cea Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 1 Aug 2017 16:25:09 -0500
Subject: We moved to storage.yml

---
 .../rails/app/templates/config/storage.yml         |  1 +
 .../app/templates/config/storage_services.yml      | 35 ----------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/config/storage_services.yml

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/storage.yml b/railties/lib/rails/generators/rails/app/templates/config/storage.yml
index 90cd00d4a6..d0dc314a1f 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/storage.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/storage.yml
@@ -21,6 +21,7 @@ local:
 #   keyfile: <%= Rails.root.join("path/to/gcs.keyfile") %>
 #   bucket: your_own_bucket
 
+# Use rails secrets:edit to set the Azure secret (as shared:azure:storage_access_key)
 # microsoft:
 #   service: Azure
 #   path: your_azure_storage_path
diff --git a/railties/lib/rails/generators/rails/app/templates/config/storage_services.yml b/railties/lib/rails/generators/rails/app/templates/config/storage_services.yml
deleted file mode 100644
index 300fcfcb21..0000000000
--- a/railties/lib/rails/generators/rails/app/templates/config/storage_services.yml
+++ /dev/null
@@ -1,35 +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
-
-# Use rails secrets:edit to set the Azure secret (as shared:azure:storage_access_key)
-# microsoft:
-#   service: Azure
-#   path: your_azure_storage_path
-#   storage_account_name: your_account_name
-#   storage_access_key: <%= Rails.application.secrets.dig(:azure, :storage_access_key) %>
-#   container: your_container_name
-
-# mirror:
-#   service: Mirror
-#   primary: local
-#   secondaries: [ amazon, google ]
-- 
cgit v1.2.3