From 382a1d0ef80382c2175149be319d7f569b4645d3 Mon Sep 17 00:00:00 2001 From: James Collins Date: Thu, 27 Apr 2023 05:47:23 +1000 Subject: [PATCH] move cdn --- config/filesystems.php | 27 +++++++++++++++------------ public/.htaccess | 9 +++++---- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/config/filesystems.php b/config/filesystems.php index 5f66356..b2feee5 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -35,19 +35,22 @@ return [ ], 'cdn' => [ - 'driver' => 's3', - 'key' => env('AWS_PUBLIC_ACCESS_KEY_ID'), - 'secret' => env('AWS_PUBLIC_SECRET_ACCESS_KEY'), - 'region' => env('AWS_PUBLIC_DEFAULT_REGION'), - 'bucket' => env('AWS_PUBLIC_BUCKET'), - 'url' => env('AWS_PUBLIC_URL'), - 'endpoint' => env('AWS_PUBLIC_ENDPOINT'), - 'use_path_style_endpoint' => env('AWS_PUBLIC_USE_PATH_STYLE_ENDPOINT', false), - 'throw' => false, + 'driver' => 'local', + 'root' => storage_path('app/public'), + 'url' => env('APP_URL') . "/storage", + // 'driver' => 's3', + // 'key' => env('AWS_PUBLIC_ACCESS_KEY_ID'), + // 'secret' => env('AWS_PUBLIC_SECRET_ACCESS_KEY'), + // 'region' => env('AWS_PUBLIC_DEFAULT_REGION'), + // 'bucket' => env('AWS_PUBLIC_BUCKET'), + // 'url' => env('AWS_PUBLIC_URL'), + // 'endpoint' => env('AWS_PUBLIC_ENDPOINT'), + // 'use_path_style_endpoint' => env('AWS_PUBLIC_USE_PATH_STYLE_ENDPOINT', false), + // 'throw' => false, 'public' => true, - 'options' => [ - 'ACL' => '', - ] + // 'options' => [ + // 'ACL' => '', + // ] ], 'private' => [ diff --git a/public/.htaccess b/public/.htaccess index db7927e..6ada41e 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -15,7 +15,7 @@ # Add www subdomain if missing RewriteCond %{HTTP_HOST} ^stemmechanics.com.au$ [NC] - RewriteRule (.*) https://www.stemmechanics.com.au/$1 [R=301,L] + RewriteRule (.*) https://www.stemmechanics.com.au/$1 [R=301,L] # Handle Authorization Header RewriteCond %{HTTP:Authorization} . @@ -27,9 +27,9 @@ RewriteRule ^ %1 [L,R=301] # Pass to media handler if the media request has query - RewriteCond %{REQUEST_FILENAME} -f - RewriteCond %{QUERY_STRING} . - RewriteRule ^uploads/(.+)\.(jpe?g|png)$ media.php?url=uploads/$1.$2 [NC,QSA,L] + #RewriteCond %{REQUEST_FILENAME} -f + #RewriteCond %{QUERY_STRING} . + #RewriteRule ^uploads/(.+)\.(jpe?g|png)$ media.php?url=uploads/$1.$2 [NC,QSA,L] # AddEncoding allows you to have certain browsers uncompress information on the fly. AddEncoding gzip .gz @@ -52,4 +52,5 @@ RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] +