normalize filesystems config

jrmajor · May 4, 2024 · 043f99d · 043f99d
1 parent 3d1cf23
commit 043f99d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.env.example b/.env.example
@@ -29,9 +29,8 @@ REDIS_CACHE_DB=
 S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_DEFAULT_REGION=
-S3_BUCKET=
 S3_ENDPOINT=
-AWS_USE_PATH_STYLE_ENDPOINT=false
+S3_BUCKET_MEDIA=
 
 FATHOM_SITE_ID=
 

diff --git a/app/Images/Image.php b/app/Images/Image.php
@@ -163,6 +163,6 @@ public function readStream()
 
     public static function disk(): FilesystemAdapter
     {
-        return Storage::disk(config('filesystems.cloud'));
+        return Storage::disk(config('filesystems.media'));
     }
 }
diff --git a/config/filesystems.php b/config/filesystems.php
@@ -2,9 +2,7 @@
 
 return [
 
-    'default' => env('FILESYSTEM_DISK', 'local'),
-
-    'cloud' => env('FILESYSTEM_CLOUD', 's3'),
+    'media' => env('FILESYSTEM_MEDIA', 'media'),
 
     'disks' => [
 
@@ -22,14 +20,14 @@
             'throw' => false,
         ],
 
-        's3' => [
+        'media' => [
             'driver' => 's3',
             'key' => env('S3_ACCESS_KEY_ID'),
             'secret' => env('S3_SECRET_ACCESS_KEY'),
             'region' => env('S3_DEFAULT_REGION'),
-            'bucket' => env('S3_BUCKET'),
+            'bucket' => env('S3_BUCKET_MEDIA'),
             'endpoint' => env('S3_ENDPOINT'),
-            'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
+            'use_path_style_endpoint' => false,
             'throw' => false,
         ],
 

diff --git a/config/schedule-monitor.php b/config/schedule-monitor.php
@@ -16,6 +16,8 @@
         'site_id' => env('OH_DEAR_SITE_ID'),
         'queue' => env('OH_DEAR_QUEUE'),
         'retry_job_for_minutes' => 10,
+        'silence_ping_oh_dear_job_in_horizon' => true,
+        'send_starting_ping' => env('OH_DEAR_SEND_STARTING_PING', false),
     ],
 
 ];
diff --git a/phpunit.xml b/phpunit.xml
@@ -29,7 +29,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="CACHE_STORE" value="array"/>
         <env name="DB_CONNECTION" value="testing"/>
-        <env name="FILESYSTEM_CLOUD" value="testing"/>
+        <env name="FILESYSTEM_MEDIA" value="testing"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>