Browse Source

Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)

Still check for S3_CLOUDFRONT_HOST for existing installs.
M Somerville 3 months ago
parent
commit
2bba6e582d

+ 2
- 2
.env.nanobox View File

@@ -136,8 +136,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
136 136
 # Defaults to 60 seconds. Set to 0 to disable
137 137
 # SWIFT_CACHE_TTL=
138 138
 
139
-# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
140
-# S3_CLOUDFRONT_HOST=
139
+# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare)
140
+# S3_ALIAS_HOST=
141 141
 
142 142
 # Streaming API integration
143 143
 # STREAMING_API_BASE_URL=

+ 2
- 2
.env.production.sample View File

@@ -134,8 +134,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
134 134
 # Defaults to 60 seconds. Set to 0 to disable
135 135
 # SWIFT_CACHE_TTL=
136 136
 
137
-# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
138
-# S3_CLOUDFRONT_HOST=
137
+# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare)
138
+# S3_ALIAS_HOST=
139 139
 
140 140
 # Streaming API integration
141 141
 # STREAMING_API_BASE_URL=

+ 2
- 2
config/initializers/paperclip.rb View File

@@ -47,10 +47,10 @@ if ENV['S3_ENABLED'] == 'true'
47 47
     Paperclip::Attachment.default_options[:url] = ':s3_path_url'
48 48
   end
49 49
 
50
-  if ENV.has_key?('S3_CLOUDFRONT_HOST')
50
+  if ENV.has_key?('S3_ALIAS_HOST') || ENV.has_key?('S3_CLOUDFRONT_HOST')
51 51
     Paperclip::Attachment.default_options.merge!(
52 52
       url: ':s3_alias_url',
53
-      s3_host_alias: ENV['S3_CLOUDFRONT_HOST']
53
+      s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST']
54 54
     )
55 55
   end
56 56
 elsif ENV['SWIFT_ENABLED'] == 'true'

+ 2
- 2
config/webpack/production.js View File

@@ -23,8 +23,8 @@ try {
23 23
 let attachmentHost;
24 24
 
25 25
 if (process.env.S3_ENABLED === 'true') {
26
-  if (process.env.S3_CLOUDFRONT_HOST) {
27
-    attachmentHost = process.env.S3_CLOUDFRONT_HOST;
26
+  if (process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST) {
27
+    attachmentHost = process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST;
28 28
   } else {
29 29
     attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`;
30 30
   }

+ 1
- 1
lib/tasks/mastodon.rake View File

@@ -222,7 +222,7 @@ namespace :mastodon do
222 222
         end
223 223
 
224 224
         if prompt.yes?('Do you want to access the uploaded files from your own domain?')
225
-          env['S3_CLOUDFRONT_HOST'] = prompt.ask('Domain for uploaded files:') do |q|
225
+          env['S3_ALIAS_HOST'] = prompt.ask('Domain for uploaded files:') do |q|
226 226
             q.required true
227 227
             q.default "files.#{env['LOCAL_DOMAIN']}"
228 228
             q.modify :strip