From 4ab6cd5b1b370bc02243e0eeb0a5fed2d26a70bd Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 30 Oct 2015 18:24:15 +0000 Subject: [PATCH] Synced config with laravel/laravel --- config/app.php | 1 + config/broadcasting.php | 3 +++ config/queue.php | 3 ++- config/services.php | 14 +++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/config/app.php b/config/app.php index 7fe105ef3..6a947bf80 100644 --- a/config/app.php +++ b/config/app.php @@ -201,6 +201,7 @@ return [ 'Eloquent' => 'Illuminate\Database\Eloquent\Model', 'Event' => 'Illuminate\Support\Facades\Event', 'File' => 'Illuminate\Support\Facades\File', + 'Gate' => 'Illuminate\Support\Facades\Gate', 'Hash' => 'Illuminate\Support\Facades\Hash', 'Input' => 'Illuminate\Support\Facades\Input', 'Inspiring' => 'Illuminate\Foundation\Inspiring', diff --git a/config/broadcasting.php b/config/broadcasting.php index 60f7ba824..848d8ffe8 100644 --- a/config/broadcasting.php +++ b/config/broadcasting.php @@ -42,6 +42,9 @@ return [ 'key' => env('PUSHER_APP_KEY'), 'secret' => env('PUSHER_APP_SECRET'), 'app_id' => env('PUSHER_APP_ID'), + 'options' => [ + // + ], ], 'redis' => [ diff --git a/config/queue.php b/config/queue.php index 7eaecbfbd..44466106d 100644 --- a/config/queue.php +++ b/config/queue.php @@ -96,7 +96,8 @@ return [ */ 'failed' => [ - 'database' => 'mysql', 'table' => 'failed_jobs', + 'database' => env('DB_DRIVER', 'sqlite'), + 'table' => 'failed_jobs', ], ]; diff --git a/config/services.php b/config/services.php index d661bdaa8..7b2493222 100644 --- a/config/services.php +++ b/config/services.php @@ -24,24 +24,24 @@ return [ */ 'mailgun' => [ - 'domain' => '', - 'secret' => '', + 'domain' => env('MAILGUN_DOMAIN'), + 'secret' => env('MAILGUN_SECRET'), ], 'mandrill' => [ - 'secret' => '', + 'secret' => env('MANDRILL_SECRET'), ], 'ses' => [ - 'key' => '', - 'secret' => '', + 'key' => env('SES_KEY'), + 'secret' => env('SES_SECRET'), 'region' => 'us-east-1', ], 'stripe' => [ 'model' => 'CachetHQ\Cachet\Models\User', - 'key' => '', - 'secret' => '', + 'key' => env('STRIPE_KEY'), + 'secret' => env('STRIPE_SECRET'), ], ];