diff --git a/config/dusk/app.php b/config/dusk/app.php deleted file mode 100644 index 79438c741..000000000 --- a/config/dusk/app.php +++ /dev/null @@ -1,30 +0,0 @@ - env('APP_URL', 'http://127.0.0.1:8000'), - - /* - |-------------------------------------------------------------------------- - | Encryption Key - |-------------------------------------------------------------------------- - | - | This key is used by the Illuminate encrypter service and should be set - | to a random, 32 character string, otherwise these encrypted strings - | will not be safe. Please do this before deploying an application! - | - */ - - 'key' => env('APP_KEY', 'Gl8AHFqlhnzcpxeJGt0zLN5qe5ngPdiC'), -]; diff --git a/config/dusk/cms.php b/config/dusk/cms.php deleted file mode 100644 index 1b0ad7107..000000000 --- a/config/dusk/cms.php +++ /dev/null @@ -1,27 +0,0 @@ - 'demo', - - /* - |-------------------------------------------------------------------------- - | Cross Site Request Forgery (CSRF) Protection - |-------------------------------------------------------------------------- - | - | If the CSRF protection is enabled, all "postback" & AJAX requests are - | checked for a valid security token. - | - */ - - 'enableCsrfProtection' => false, -]; diff --git a/config/dusk/database.php b/config/dusk/database.php deleted file mode 100644 index 072d9b35b..000000000 --- a/config/dusk/database.php +++ /dev/null @@ -1,146 +0,0 @@ - PDO::FETCH_CLASS, - - /* - |-------------------------------------------------------------------------- - | Default Database Connection Name - |-------------------------------------------------------------------------- - | - | Here you may specify which of the database connections below you wish - | to use as your default connection for all database work. Of course - | you may use many connections at once using the Database library. - | - */ - - 'default' => env('DB_CONNECTION', 'sqlite'), - - /* - |-------------------------------------------------------------------------- - | Database Connections - |-------------------------------------------------------------------------- - | - | Here are each of the database connections setup for your application. - | Of course, examples of configuring each database platform that is - | supported by Laravel is shown below to make development simple. - | - | - | All database work in Laravel is done through the PHP PDO facilities - | so make sure you have the driver for your particular database of - | choice installed on your machine before you begin development. - | - */ - - 'connections' => [ - - 'sqlite' => [ - 'driver' => 'sqlite', - 'database' => env('DB_DATABASE', 'storage/dusk.sqlite'), - 'prefix' => '', - ], - - 'mysql' => [ - 'driver' => 'mysql', - 'engine' => 'InnoDB', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 3306), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8mb4', - 'collation' => 'utf8mb4_unicode_ci', - 'prefix' => '', - 'varcharmax' => 191, - ], - - 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 5432), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', - ], - - 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', 'localhost'), - 'port' => env('DB_PORT', 5432), - 'database' => env('DB_DATABASE', 'database'), - 'username' => env('DB_USERNAME', ''), - 'password' => env('DB_PASSWORD', ''), - 'prefix' => '', - ], - - ], - - /* - |-------------------------------------------------------------------------- - | Migration Repository Table - |-------------------------------------------------------------------------- - | - | This table keeps track of all the migrations that have already run for - | your application. Using this information, we can determine which of - | the migrations on disk have not actually be run in the databases. - | - */ - - 'migrations' => 'migrations', - - /* - |-------------------------------------------------------------------------- - | Redis Databases - |-------------------------------------------------------------------------- - | - | Redis is an open source, fast, and advanced key-value store that also - | provides a richer set of commands than a typical key-value systems - | such as APC or Memcached. Laravel makes it easy to dig right in. - | - */ - - 'redis' => [ - - 'cluster' => false, - - 'default' => [ - 'host' => env('REDIS_HOST', '127.0.0.1'), - 'password' => env('REDIS_PASSWORD', ''), - 'port' => env('REDIS_PORT', 6379), - 'database' => 0, - ], - - ], - - /* - |-------------------------------------------------------------------------- - | Use DB configuration for testing - |-------------------------------------------------------------------------- - | - | When running plugin tests OctoberCMS by default uses SQLite in memory. - | You can override this behavior by setting `useConfigForTesting` to true. - | - | After that OctoberCMS will take DB parameters from the config. - | If file `/config/testing/database.php` exists, config will be read from it, - | but remember that when not specified it will use parameters specified in - | `/config/database.php`. - | - */ - - 'useConfigForTesting' => env('DB_USE_CONFIG_FOR_TESTING', false), -]; diff --git a/config/logging.php b/config/logging.php index 329b7a934..900d48123 100644 --- a/config/logging.php +++ b/config/logging.php @@ -1,8 +1,5 @@ env('LOG_CHANNEL', 'stack'), + 'default' => env('LOG_CHANNEL', 'single'), /* |-------------------------------------------------------------------------- @@ -56,7 +53,7 @@ return [ 'slack' => [ 'driver' => 'slack', 'url' => env('LOG_SLACK_WEBHOOK_URL'), - 'username' => 'Laravel Log', + 'username' => 'October CMS Log', 'emoji' => ':boom:', 'level' => 'critical', ], @@ -64,7 +61,7 @@ return [ 'papertrail' => [ 'driver' => 'monolog', 'level' => 'debug', - 'handler' => SyslogUdpHandler::class, + 'handler' => \Monolog\Handler\SyslogUdpHandler::class, 'handler_with' => [ 'host' => env('PAPERTRAIL_URL'), 'port' => env('PAPERTRAIL_PORT'), @@ -73,7 +70,7 @@ return [ 'stderr' => [ 'driver' => 'monolog', - 'handler' => StreamHandler::class, + 'handler' => \Monolog\Handler\StreamHandler::class, 'formatter' => env('LOG_STDERR_FORMATTER'), 'with' => [ 'stream' => 'php://stderr',