Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pounced-on.me
mastodon
Commits
2bba6e58
Commit
2bba6e58
authored
6 years ago
by
M Somerville
Committed by
Eugen Rochko
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)
Still check for S3_CLOUDFRONT_HOST for existing installs.
parent
29da56cf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.env.nanobox
+2
-2
.env.nanobox
.env.production.sample
+2
-2
.env.production.sample
config/initializers/paperclip.rb
+2
-2
config/initializers/paperclip.rb
config/webpack/production.js
+2
-2
config/webpack/production.js
lib/tasks/mastodon.rake
+1
-1
lib/tasks/mastodon.rake
with
9 additions
and
9 deletions
+9
-9
.env.nanobox
+
2
-
2
View file @
2bba6e58
...
...
@@ -136,8 +136,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
# Defaults to 60 seconds. Set to 0 to disable
# SWIFT_CACHE_TTL=
# Optional alias for S3
if you want to use
Cloudfront or Cloudflare
in front
# S3_
CLOUDFRONT
_HOST=
# Optional alias for S3
(e.g. to serve files on a custom domain, possibly using
Cloudfront or Cloudflare
)
# S3_
ALIAS
_HOST=
# Streaming API integration
# STREAMING_API_BASE_URL=
...
...
This diff is collapsed.
Click to expand it.
.env.production.sample
+
2
-
2
View file @
2bba6e58
...
...
@@ -134,8 +134,8 @@ SMTP_FROM_ADDRESS=notifications@example.com
# Defaults to 60 seconds. Set to 0 to disable
# SWIFT_CACHE_TTL=
# Optional alias for S3
if you want to use
Cloudfront or Cloudflare
in front
# S3_
CLOUDFRONT
_HOST=
# Optional alias for S3
(e.g. to serve files on a custom domain, possibly using
Cloudfront or Cloudflare
)
# S3_
ALIAS
_HOST=
# Streaming API integration
# STREAMING_API_BASE_URL=
...
...
This diff is collapsed.
Click to expand it.
config/initializers/paperclip.rb
+
2
-
2
View file @
2bba6e58
...
...
@@ -47,10 +47,10 @@ if ENV['S3_ENABLED'] == 'true'
Paperclip
::
Attachment
.
default_options
[
:url
]
=
':s3_path_url'
end
if
ENV
.
has_key?
(
'S3_CLOUDFRONT_HOST'
)
if
ENV
.
has_key?
(
'S3_ALIAS_HOST'
)
||
ENV
.
has_key?
(
'S3_CLOUDFRONT_HOST'
)
Paperclip
::
Attachment
.
default_options
.
merge!
(
url:
':s3_alias_url'
,
s3_host_alias:
ENV
[
'S3_CLOUDFRONT_HOST'
]
s3_host_alias:
ENV
[
'S3_ALIAS_HOST'
]
||
ENV
[
'S3_CLOUDFRONT_HOST'
]
)
end
elsif
ENV
[
'SWIFT_ENABLED'
]
==
'true'
...
...
This diff is collapsed.
Click to expand it.
config/webpack/production.js
+
2
-
2
View file @
2bba6e58
...
...
@@ -23,8 +23,8 @@ try {
let
attachmentHost
;
if
(
process
.
env
.
S3_ENABLED
===
'
true
'
)
{
if
(
process
.
env
.
S3_CLOUDFRONT_HOST
)
{
attachmentHost
=
process
.
env
.
S3_CLOUDFRONT_HOST
;
if
(
process
.
env
.
S3_ALIAS_HOST
||
process
.
env
.
S3_CLOUDFRONT_HOST
)
{
attachmentHost
=
process
.
env
.
S3_ALIAS_HOST
||
process
.
env
.
S3_CLOUDFRONT_HOST
;
}
else
{
attachmentHost
=
process
.
env
.
S3_HOSTNAME
||
`s3-
${
process
.
env
.
S3_REGION
||
'
us-east-1
'
}
.amazonaws.com`
;
}
...
...
This diff is collapsed.
Click to expand it.
lib/tasks/mastodon.rake
+
1
-
1
View file @
2bba6e58
...
...
@@ -222,7 +222,7 @@ namespace :mastodon do
end
if
prompt
.
yes?
(
'Do you want to access the uploaded files from your own domain?'
)
env
[
'S3_
CLOUDFRONT
_HOST'
]
=
prompt
.
ask
(
'Domain for uploaded files:'
)
do
|
q
|
env
[
'S3_
ALIAS
_HOST'
]
=
prompt
.
ask
(
'Domain for uploaded files:'
)
do
|
q
|
q
.
required
true
q
.
default
"files.
#{
env
[
'LOCAL_DOMAIN'
]
}
"
q
.
modify
:strip
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help