mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-28 13:12:05 +00:00
Added check for s3 bucket name to choose shortest url
This commit is contained in:
parent
8b899a9cf0
commit
c44314def3
@ -259,9 +259,15 @@ class ImageService
|
|||||||
$storageUrl = config('filesystems.url');
|
$storageUrl = config('filesystems.url');
|
||||||
|
|
||||||
// Get the standard public s3 url if s3 is set as storage type
|
// Get the standard public s3 url if s3 is set as storage type
|
||||||
|
// Uses the nice, short URL if bucket name has no periods in otherwise the longer
|
||||||
|
// region-based url will be used to prevent http issues.
|
||||||
if ($storageUrl == false && config('filesystems.default') === 's3') {
|
if ($storageUrl == false && config('filesystems.default') === 's3') {
|
||||||
$storageDetails = config('filesystems.disks.s3');
|
$storageDetails = config('filesystems.disks.s3');
|
||||||
|
if (strpos($storageDetails['bucket'], '.') === false) {
|
||||||
$storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com';
|
$storageUrl = 'https://' . $storageDetails['bucket'] . '.s3.amazonaws.com';
|
||||||
|
} else {
|
||||||
|
$storageUrl = 'https://s3-' . $storageDetails['region'] . '.amazonaws.com/' . $storageDetails['bucket'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->storageUrl = $storageUrl;
|
$this->storageUrl = $storageUrl;
|
||||||
|
Loading…
Reference in New Issue
Block a user