A free open source IT asset/license management system
Added endpoint & use_path_style_endpoint configs for public/private S3
Patrick Thomas6eaefa0bdd0d
diff --git a/.env.dev.docker b/.env.dev.dockerindex f47e69ce4b..dbf8451671 100644--- a/.env.dev.docker+++ b/.env.dev.docker@@ -137,6 +137,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=nullPUBLIC_AWS_DEFAULT_REGION=nullPUBLIC_AWS_BUCKET=nullPUBLIC_AWS_URL=null+PUBLIC_AWS_ENDPOINT=null+PUBLIC_AWS_PATH_STYLE=nullPUBLIC_AWS_BUCKET_ROOT=null# --------------------------------------------@@ -147,6 +149,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=nullPRIVATE_AWS_DEFAULT_REGION=nullPRIVATE_AWS_BUCKET=nullPRIVATE_AWS_URL=null+PRIVATE_AWS_ENDPOINT=null+PRIVATE_AWS_PATH_STYLE=nullPRIVATE_AWS_BUCKET_ROOT=null# --------------------------------------------diff --git a/.env.docker b/.env.dockerindex 9eae34385e..b0867fd0bb 100644--- a/.env.docker+++ b/.env.docker@@ -144,6 +144,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=nullPUBLIC_AWS_DEFAULT_REGION=nullPUBLIC_AWS_BUCKET=nullPUBLIC_AWS_URL=null+PUBLIC_AWS_ENDPOINT=null+PUBLIC_AWS_PATH_STYLE=nullPUBLIC_AWS_BUCKET_ROOT=null# --------------------------------------------@@ -154,6 +156,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=nullPRIVATE_AWS_DEFAULT_REGION=nullPRIVATE_AWS_BUCKET=nullPRIVATE_AWS_URL=null+PRIVATE_AWS_ENDPOINT=null+PRIVATE_AWS_PATH_STYLE=nullPRIVATE_AWS_BUCKET_ROOT=null# --------------------------------------------diff --git a/.env.example b/.env.exampleindex b850885002..5f7ab85501 100644--- a/.env.example+++ b/.env.example@@ -143,6 +143,8 @@ PUBLIC_AWS_ACCESS_KEY_ID=nullPUBLIC_AWS_DEFAULT_REGION=nullPUBLIC_AWS_BUCKET=nullPUBLIC_AWS_URL=null+PUBLIC_AWS_ENDPOINT=null+PUBLIC_AWS_PATH_STYLE=nullPUBLIC_AWS_BUCKET_ROOT=null# --------------------------------------------@@ -153,6 +155,8 @@ PRIVATE_AWS_SECRET_ACCESS_KEY=nullPRIVATE_AWS_DEFAULT_REGION=nullPRIVATE_AWS_BUCKET=nullPRIVATE_AWS_URL=null+PRIVATE_AWS_ENDPOINT=null+PRIVATE_AWS_PATH_STYLE=nullPRIVATE_AWS_BUCKET_ROOT=null# --------------------------------------------diff --git a/config/filesystems.php b/config/filesystems.phpindex 6098438ed2..54ce6614aa 100644--- a/config/filesystems.php+++ b/config/filesystems.php@@ -63,6 +63,8 @@ $config = ['region' => env('PUBLIC_AWS_DEFAULT_REGION'),'bucket' => env('PUBLIC_AWS_BUCKET'),'url' => env('PUBLIC_AWS_URL'),+ 'endpoint' => env('PUBLIC_AWS_ENDPOINT'),+ 'use_path_style_endpoint' => env('PUBLIC_AWS_PATH_STYLE'),'root' => env('PUBLIC_AWS_BUCKET_ROOT'),'visibility' => 'public'],@@ -78,6 +80,8 @@ $config = ['region' => env('PRIVATE_AWS_DEFAULT_REGION'),'bucket' => env('PRIVATE_AWS_BUCKET'),'url' => env('PRIVATE_AWS_URL'),+ 'endpoint' => env('PRIVATE_AWS_ENDPOINT'),+ 'use_path_style_endpoint' => env('PRIVATE_AWS_PATH_STYLE'),'root' => env('PRIVATE_AWS_BUCKET_ROOT'),'visibility' => 'private'],@@ -168,4 +172,4 @@ $config['allowed_upload_mimetypes'] = implode(',', $config['allowed_upload_mimet$config['allowed_upload_extensions_for_validator'] = implode(',', $config['allowed_upload_extensions_array']);$config['allowed_upload_extensions'] = '.'.implode(', .', $config['allowed_upload_extensions_array']);-return $config;\ No newline at end of file+return $config;