diff --git a/config/app.php b/config/app.php index 280139b6..d04d0027 100644 --- a/config/app.php +++ b/config/app.php @@ -222,11 +222,14 @@ return [ 'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, + 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, + 'Bus' => Illuminate\Support\Facades\Bus::class, 'Cache' => Illuminate\Support\Facades\Cache::class, 'Config' => Illuminate\Support\Facades\Config::class, 'Cookie' => Illuminate\Support\Facades\Cookie::class, 'Crypt' => Illuminate\Support\Facades\Crypt::class, 'DB' => Illuminate\Support\Facades\DB::class, + 'Eloquent' => Illuminate\Database\Eloquent\Model::class, 'Event' => Illuminate\Support\Facades\Event::class, 'File' => Illuminate\Support\Facades\File::class, 'Gate' => Illuminate\Support\Facades\Gate::class, diff --git a/config/broadcasting.php b/config/broadcasting.php index 9305cdeb..01c1213a 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -20,9 +20,11 @@ return [ | framework when an event needs to be broadcast. You may set this to | any of the connections defined in the "connections" array below. | + | Supported: "pusher", "redis", "log", "null" + | */ - 'default' => env('BROADCAST_DRIVER', 'pusher'), + 'default' => env('BROADCAST_DRIVER', 'null'), /* |-------------------------------------------------------------------------- @@ -39,9 +41,9 @@ return [ 'pusher' => [ 'driver' => 'pusher', - 'key' => null, - 'secret' => null, - 'app_id' => null, + 'key' => env('PUSHER_APP_KEY'), + 'secret' => env('PUSHER_APP_SECRET'), + 'app_id' => env('PUSHER_APP_ID'), 'options' => [ // ], @@ -56,6 +58,10 @@ return [ 'driver' => 'log', ], + 'null' => [ + 'driver' => 'null', + ], + ], ]; diff --git a/config/cache.php b/config/cache.php index c10d1761..fe8bbc8d 100644 --- a/config/cache.php +++ b/config/cache.php @@ -10,6 +10,7 @@ */ return [ + /* |-------------------------------------------------------------------------- | Default Cache Store @@ -22,7 +23,9 @@ return [ | Supported: "apc", "array", "database", "file", "memcached", "redis" | */ + 'default' => env('CACHE_DRIVER', 'file'), + /* |-------------------------------------------------------------------------- | Cache Stores @@ -33,22 +36,28 @@ return [ | same cache driver to group types of items stored in your caches. | */ + 'stores' => [ + 'apc' => [ 'driver' => 'apc', ], + 'array' => [ 'driver' => 'array', ], + 'database' => [ 'driver' => 'database', 'table' => 'cache', 'connection' => null, ], + 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache'), + 'path' => storage_path('framework/cache/data'), ], + 'memcached' => [ 'driver' => 'memcached', 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), @@ -67,11 +76,14 @@ return [ ], ], ], + 'redis' => [ 'driver' => 'redis', 'connection' => 'default', ], + ], + /* |-------------------------------------------------------------------------- | Cache Key Prefix @@ -82,5 +94,7 @@ return [ | value to get prefixed to all our keys so we can avoid collisions. | */ + 'prefix' => 'laravel', + ]; diff --git a/config/filesystems.php b/config/filesystems.php index 35acb710..42bf6c5a 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -17,14 +17,12 @@ return [ |-------------------------------------------------------------------------- | | Here you may specify the default filesystem disk that should be used - | by the framework. A "local" driver, as well as a variety of cloud - | based drivers are available for your choosing. Just store away! - | - | Supported: "local", "ftp", "s3", "rackspace" + | by the framework. The "local" disk, as well as a variety of cloud + | based disks are available to your application. Just store away! | */ - 'default' => 'local', + 'default' => env('FILESYSTEM_DRIVER', 'local'), /* |-------------------------------------------------------------------------- @@ -37,7 +35,7 @@ return [ | */ - 'cloud' => 's3', + 'cloud' => env('FILESYSTEM_CLOUD', 's3'), /* |-------------------------------------------------------------------------- @@ -48,6 +46,8 @@ return [ | may even configure multiple disks of the same driver. Defaults have | been setup for each driver as an example of the required options. | + | Supported Drivers: "local", "ftp", "s3", "rackspace" + | */ 'disks' => [ @@ -60,15 +60,16 @@ return [ 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), + 'url' => env('APP_URL').'/storage', 'visibility' => 'public', ], 's3' => [ 'driver' => 's3', - 'key' => 'your-key', - 'secret' => 'your-secret', - 'region' => 'your-region', - 'bucket' => 'your-bucket', + 'key' => env('AWS_KEY'), + 'secret' => env('AWS_SECRET'), + 'region' => env('AWS_REGION'), + 'bucket' => env('AWS_BUCKET'), ], ], diff --git a/config/mail.php b/config/mail.php index da6c7cc9..122eddc5 100644 --- a/config/mail.php +++ b/config/mail.php @@ -20,8 +20,8 @@ return [ | sending of e-mail. You may specify which one you're using throughout | your application here. By default, Laravel is setup for SMTP mail. | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", - | "ses", "sparkpost", "log" + | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses", + | "sparkpost", "log", "array" | */ @@ -64,7 +64,10 @@ return [ | */ - 'from' => ['address' => env('MAIL_ADDRESS'), 'name' => env('MAIL_NAME', 'Cachet')], + 'from' => [ + 'address' => env('MAIL_ADDRESS'), + 'name' => env('MAIL_NAME', 'Cachet'), + ], /* |-------------------------------------------------------------------------- @@ -92,17 +95,6 @@ return [ 'username' => env('MAIL_USERNAME'), - /* - |-------------------------------------------------------------------------- - | SMTP Server Password - |-------------------------------------------------------------------------- - | - | Here you may set the password required by your SMTP server to send out - | messages from your application. This will be given to the server on - | connection so that the application will be able to send messages. - | - */ - 'password' => env('MAIL_PASSWORD'), /* @@ -118,4 +110,23 @@ return [ 'sendmail' => '/usr/sbin/sendmail -bs', + /* + |-------------------------------------------------------------------------- + | Markdown Mail Settings + |-------------------------------------------------------------------------- + | + | If you are using Markdown based email rendering, you may configure your + | theme and component paths here, allowing you to customize the design + | of the emails. Or, you may simply stick with the Laravel defaults! + | + */ + + 'markdown' => [ + 'theme' => 'default', + + 'paths' => [ + resource_path('views/vendor/mail'), + ], + ], + ]; diff --git a/config/queue.php b/config/queue.php index dd532080..a279d302 100644 --- a/config/queue.php +++ b/config/queue.php @@ -16,15 +16,15 @@ return [ | Default Queue Driver |-------------------------------------------------------------------------- | - | The Laravel queue API supports a variety of back-ends via an unified + | Laravel's queue API supports an assortment of back-ends via a single | API, giving you convenient access to each back-end using the same | syntax for each one. Here you may set the default queue driver. | - | Supported: "null", "sync", "database", "beanstalkd", "sqs", "redis" + | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null" | */ - 'default' => env('QUEUE_DRIVER', 'database'), + 'default' => env('QUEUE_DRIVER', 'sync'), /* |-------------------------------------------------------------------------- @@ -47,14 +47,14 @@ return [ 'driver' => 'database', 'table' => 'jobs', 'queue' => 'default', - 'retry_after' => 60, + 'retry_after' => 90, ], 'beanstalkd' => [ - 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'retry_after' => 60, + 'driver' => 'beanstalkd', + 'host' => 'localhost', + 'queue' => 'default', + 'retry_after' => 90, ], 'sqs' => [ @@ -67,10 +67,10 @@ return [ ], 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - 'queue' => 'default', - 'retry_after' => 86400, + 'driver' => 'redis', + 'connection' => 'default', + 'queue' => 'default', + 'retry_after' => 90, ], ], diff --git a/config/view.php b/config/view.php index 7427ba13..f2463322 100644 --- a/config/view.php +++ b/config/view.php @@ -22,7 +22,9 @@ return [ | */ - 'paths' => [realpath(base_path('resources/views'))], + 'paths' => [ + resource_path('views'), + ], /* |--------------------------------------------------------------------------