Update config/database, AuthServiceProvider and env.example

NNTmux · May 31, 2019 · 4d571d3 · 4d571d3
1 parent c80faea
commit 4d571d3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/.env.example b/.env.example
@@ -68,9 +68,18 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=
 MAIL_FROM_NAME=
 
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
 NOCAPTCHA_ENABLED=
 NOCAPTCHA_SITEKEY=

diff --git a/Changelog b/Changelog
@@ -1,4 +1,5 @@
 2019-05-31 DariusIII
+	* CHg: Update config/database, AuthServiceProvider and env.example
 	* Chg: Update laravel/horizon to version 3.2.1
 2019-05-30 DariusIII
 	* Chg: Update used libraries to their latest versions

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -12,7 +12,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        //'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**

diff --git a/config/database.php b/config/database.php
@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -35,12 +37,14 @@
 
         'sqlite' => [
             'driver'   => 'sqlite',
+            'url'      => env('DATABASE_URL'),
             'database' => env('DB_DATABASE', database_path('database.sqlite')),
             'prefix'   => '',
         ],
 
         'mysql' => [
             'driver'      => 'mysql',
+            'url'         => env('DATABASE_URL'),
             'host'        => env('DB_HOST', '127.0.0.1'),
             'port'        => env('DB_PORT', '3306'),
             'database'    => env('DB_DATABASE', 'nntmux'),
@@ -59,6 +63,7 @@
 
         'pgsql' => [
             'driver'   => 'pgsql',
+            'url'      => env('DATABASE_URL'),
             'host'     => env('DB_HOST', '127.0.0.1'),
             'port'     => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'nntmux'),
@@ -72,6 +77,7 @@
 
         'sqlsrv' => [
             'driver'   => 'sqlsrv',
+            'url'      => env('DATABASE_URL'),
             'host'     => env('DB_HOST', 'localhost'),
             'port'     => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'nntmux'),
@@ -118,13 +124,19 @@
 
     'redis' => [
         'client' => 'predis',
+        'options' => [
+            'cluster' => env('REDIS_CLUSTER', 'predis'),
+            'prefix' => Str::slug(env('APP_NAME', 'laravel'), '_').'_database_',
+        ],
         'default' => [
+            'url'  => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),
             'database' => env('REDIS_DB', 0),
         ],
         'cache' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port' => env('REDIS_PORT', 6379),