Sync config defaults with Laravel 9.x skeleton

Changed from Laravel defaults:
- Array configuration items should have their assigner operators aligned and keys should be sorted alphabetically

Removed:
- database.fetch: Removed from the default in Laravel 5.4 (and originally changed to FETCH_OBJ in 5.3) see 770c41552f & https://github.com/laravel/laravel/pull/3815
- filesystems.cloud: Removed from the default in Laravel 8.4.4 since it's not good practice to use Storage::cloud(), should use explicit disk configurations instead. See 82213fbf40
- services.mandrill: No longer officially supported since < Laravel 6.x; can use the SMTP driver instead
- services.sparkport: No longer officially supported in Laravel since < Laravel 6.x or Winter since v1.2 (third party package to reprovide driver is available but config should be manually added when desired.)
- services.stripe: Removed in Laravel v5.8.35, see 83d2ecc0e9

Explicitly not synced:
- Some calls to env(), will be addressed by future work on the ConfigWriter
- auth.php, will be addressed by future work to bring the Winter auth system more in line with the Laravel one
- cors.php, not implemented by default in Winter at the moment, plugins are available
- filesystems.php: storage.links & storage.disks.public not included because storage:link is not supported by Winter yet and further thought is needed for its inclusion.
- mail.php: markdown - Laravel's markdown mail functionality not verified to work within Winter which has it's own set of email templating logic. May be investigated and included later down the road if desired.
- sanctum.php: Laravel Sanctum is an authentication system for Laravel that is completely untested with Winter. Can be evaluated at a later date for inclusion.
This commit is contained in:
Luke Towers 2022-02-14 14:42:24 -06:00
parent b532c66661
commit f6510979cc
12 changed files with 276 additions and 277 deletions

View File

@ -42,7 +42,7 @@ return [
|
*/
'url' => 'http://localhost',
'url' => env('APP_URL', 'http://localhost'),
/*
|--------------------------------------------------------------------------
@ -230,7 +230,7 @@ return [
|
*/
'key' => 'CHANGE_ME!!!!!!!!!!!!!!!!!!!!!!!',
'key' => env('APP_KEY'),
'cipher' => 'AES-256-CBC',

View File

@ -11,11 +11,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"
| Supported: "pusher", "ably", "redis", "log", "null"
|
*/
'default' => 'pusher',
'default' => env('BROADCAST_DRIVER', 'null'),
/*
|--------------------------------------------------------------------------
@ -31,19 +31,27 @@ return [
'connections' => [
'pusher' => [
'driver' => 'pusher',
'key' => '',
'secret' => '',
'app_id' => '',
'options' => [
'cluster' => '',
'app_id' => env('PUSHER_APP_ID'),
'client_options' => [
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
],
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
],
'secret' => env('PUSHER_APP_SECRET'),
],
'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'driver' => 'redis',
],
'log' => [

View File

@ -18,7 +18,7 @@ return [
|
*/
'default' => 'file',
'default' => env('CACHE_DRIVER', 'file'),
/*
|--------------------------------------------------------------------------
@ -29,8 +29,8 @@ return [
| well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches.
|
| Supported: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb"
| Supported drivers: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb", "octane", "null"
|
*/
@ -41,13 +41,15 @@ return [
],
'array' => [
'driver' => 'array',
'driver' => 'array',
'serialize' => false,
],
'database' => [
'driver' => 'database',
'table' => 'cache',
'connection' => null,
'connection' => null,
'driver' => 'database',
'lock_connection' => null,
'table' => 'cache',
],
'file' => [
@ -56,16 +58,16 @@ return [
],
'memcached' => [
'driver' => 'memcached',
'driver' => 'memcached',
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'servers' => [
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
@ -75,17 +77,22 @@ return [
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'connection' => 'cache',
'driver' => 'redis',
'lock_connection' => 'default',
],
'dynamodb' => [
'driver' => 'dynamodb',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
'endpoint' => env('DYNAMODB_ENDPOINT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
],
'octane' => [
'driver' => 'octane',
],
],
@ -101,7 +108,7 @@ return [
|
*/
'prefix' => 'winter',
'prefix' => env('CACHE_PREFIX', str_slug(env('APP_NAME', 'winter'), '_').'_cache'),
/*
|--------------------------------------------------------------------------

View File

@ -2,19 +2,6 @@
return [
/*
|--------------------------------------------------------------------------
| PDO Fetch Style
|--------------------------------------------------------------------------
|
| By default, database results will be returned as instances of the PHP
| stdClass object; however, you may desire to retrieve records in an
| array format for simplicity. Here you can tweak the fetch style.
|
*/
'fetch' => PDO::FETCH_CLASS,
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
@ -46,56 +33,60 @@ return [
'connections' => [
'sqlite' => [
'database' => env('DB_DATABASE', storage_path('database.sqlite')),
'driver' => 'sqlite',
// 'url' => env('DATABASE_URL'),
'database' => base_path('storage/database.sqlite'),
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
'prefix' => '',
'foreign_key_constraints' => true,
'url' => env('DATABASE_URL'),
],
'mysql' => [
'driver' => 'mysql',
// 'url' => env('DATABASE_URL'),
'engine' => 'InnoDB',
'host' => '127.0.0.1',
'port' => 3306,
'database' => 'database',
'username' => 'root',
'password' => '',
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'mysql',
'engine' => 'InnoDB',
'host' => env('DB_HOST', '127.0.0.1'),
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '3306'),
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'unix_socket' => env('DB_SOCKET', ''),
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
'varcharmax' => 191,
],
'pgsql' => [
'driver' => 'pgsql',
// 'url' => env('DATABASE_URL'),
'host' => '127.0.0.1',
'port' => 5432,
'database' => 'database',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'pgsql',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '5432'),
'prefix' => '',
'prefix_indexes' => true,
'schema' => 'public',
'search_path' => 'public',
'sslmode' => 'prefer',
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
],
'sqlsrv' => [
'driver' => 'sqlsrv',
// 'url' => env('DATABASE_URL'),
'host' => '127.0.0.1',
'port' => 1433,
'database' => 'database',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
'database' => env('DB_DATABASE', 'winter'),
'driver' => 'sqlsrv',
'host' => env('DB_HOST', '127.0.0.1'),
'password' => env('DB_PASSWORD', ''),
'port' => env('DB_PORT', '1433'),
'prefix' => '',
'prefix_indexes' => true,
'url' => env('DATABASE_URL'),
'username' => env('DB_USERNAME', 'winter'),
],
],
@ -107,7 +98,7 @@ return [
|
| 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.
| the migrations on disk haven't actually been run in the database.
|
*/
@ -119,28 +110,36 @@ return [
|--------------------------------------------------------------------------
|
| 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. Winter CMS makes it easy to dig right in.
| provides a richer body of commands than a typical key-value system
| such as APC or Memcached. Winter makes it easy to dig right in.
|
*/
'redis' => [
'client' => 'predis',
'client' => env('REDIS_CLIENT', 'phpredis'),
'options' => [
'cluster' => 'redis',
'prefix' => '',
'cluster' => env('REDIS_CLUSTER', 'redis'),
'prefix' => env('REDIS_PREFIX', str_slug(env('APP_NAME', 'winter'), '_').'_database_'),
],
'default' => [
// 'url' => env('REDIS_URL'),
'host' => '127.0.0.1',
'password' => null,
'port' => 6379,
'database' => 0,
'database' => env('REDIS_DB', '0'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
],
'cache' => [
'database' => env('REDIS_CACHE_DB', '1'),
'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD'),
'port' => env('REDIS_PORT', '6379'),
'url' => env('REDIS_URL'),
],
],
];
];

View File

@ -13,20 +13,7 @@ return [
|
*/
'default' => 'local',
/*
|--------------------------------------------------------------------------
| Default Cloud Filesystem Disk
|--------------------------------------------------------------------------
|
| Many applications store files both locally and in the cloud. For this
| reason, you may specify a default "cloud" driver here. This driver
| will be bound as the Cloud disk implementation in the container.
|
*/
'cloud' => 's3',
'default' => env('FILESYSTEM_DISK', 'local'),
/*
|--------------------------------------------------------------------------
@ -50,13 +37,14 @@ return [
],
's3' => [
'driver' => 's3',
'key' => '',
'secret' => '',
'region' => '',
'bucket' => '',
// 'url' => env('AWS_URL'),
// 'endpoint' => env('AWS_ENDPOINT'),
'bucket' => env('AWS_BUCKET'),
'driver' => 's3',
'endpoint' => env('AWS_ENDPOINT'),
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'url' => env('AWS_URL'),
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
],
],

View File

@ -44,9 +44,9 @@ return [
*/
'argon' => [
'memory' => 1024,
'threads' => 2,
'time' => 2,
'memory' => 65536,
'threads' => 1,
'time' => 4,
],
];

View File

@ -13,7 +13,20 @@ return [
|
*/
'default' => env('LOG_CHANNEL', 'single'),
'default' => env('LOG_CHANNEL', 'stack'),
/*
|--------------------------------------------------------------------------
| Deprecations Log Channel
|--------------------------------------------------------------------------
|
| This option controls the log channel that should be used to log warnings
| regarding deprecated PHP and library features. This allows you to get
| your application ready for upcoming major versions of dependencies.
|
*/
'deprecations' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
/*
|--------------------------------------------------------------------------
@ -21,7 +34,7 @@ return [
|--------------------------------------------------------------------------
|
| Here you may configure the log channels for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| the box, Winter uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Drivers: "single", "daily", "slack", "syslog",
@ -32,59 +45,70 @@ return [
'channels' => [
'stack' => [
'channels' => ['single'],
'driver' => 'stack',
'channels' => ['daily'],
'ignore_exceptions' => false,
],
'single' => [
'driver' => 'single',
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
'level' => 'debug',
],
'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/system.log'),
'level' => 'debug',
'days' => 14,
'driver' => 'daily',
'level' => env('LOG_LEVEL', 'debug'),
'path' => storage_path('logs/system.log'),
],
'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Winter CMS Log',
'emoji' => ':boom:',
'level' => 'critical',
'level' => env('LOG_LEVEL', 'critical'),
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Winter Log',
],
'papertrail' => [
'driver' => 'monolog',
'level' => 'debug',
'handler' => \Monolog\Handler\SyslogUdpHandler::class,
'handler' => env('LOG_PAPERTRAIL_HANDLER', \Monolog\Handler\SyslogUdpHandler::class),
'handler_with' => [
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
],
'level' => env('LOG_LEVEL', 'debug'),
],
'stderr' => [
'driver' => 'monolog',
'handler' => \Monolog\Handler\StreamHandler::class,
'formatter' => env('LOG_STDERR_FORMATTER'),
'with' => [
'handler' => \Monolog\Handler\StreamHandler::class,
'level' => env('LOG_LEVEL', 'debug'),
'with' => [
'stream' => 'php://stderr',
],
],
'syslog' => [
'driver' => 'syslog',
'level' => 'debug',
'level' => env('LOG_LEVEL', 'debug'),
],
'errorlog' => [
'driver' => 'errorlog',
'level' => 'debug',
'level' => env('LOG_LEVEL', 'debug'),
],
'null' => [
'driver' => 'monolog',
'handler' => \Monolog\Handler\NullHandler::class,
],
'emergency' => [
'path' => storage_path('logs/system.log'),
],
],

View File

@ -4,45 +4,80 @@ return [
/*
|--------------------------------------------------------------------------
| Mail Driver
| Default Mailer
|--------------------------------------------------------------------------
|
| Laravel supports both SMTP and PHP's "mail" function as drivers for the
| 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", "sendmail", "mailgun", "mandrill", "ses",
| "postmark", "sparkpost", "log", "array"
| This option controls the default mailer that is used to send any email
| messages sent by your application. Alternative mailers may be setup
| and used as needed; however, this mailer will be used by default.
|
*/
'driver' => 'smtp',
'default' => env('MAIL_MAILER', 'smtp'),
/*
|--------------------------------------------------------------------------
| SMTP Host Address
| Mailer Configurations
|--------------------------------------------------------------------------
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Mailgun mail service which will provide reliable deliveries.
| Here you may configure all of the mailers used by your application plus
| their respective settings. Several examples have been configured for
| you and you are free to add your own as your application requires.
|
| Winter supports a variety of mail "transport" drivers to be used while
| sending an e-mail. You will specify which one you are using for your
| mailers below. You are free to add additional mailers as required.
|
| Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array", "failover"
|
*/
'host' => 'smtp.mailgun.org',
'mailers' => [
'smtp' => [
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
'password' => env('MAIL_PASSWORD'),
'port' => env('MAIL_PORT', 587),
'timeout' => null,
'transport' => 'smtp',
'username' => env('MAIL_USERNAME'),
],
/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
|
*/
'ses' => [
'transport' => 'ses',
],
'port' => 587,
'mailgun' => [
'transport' => 'mailgun',
],
'postmark' => [
'transport' => 'postmark',
],
'sendmail' => [
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'),
'transport' => 'sendmail',
],
'log' => [
'channel' => env('MAIL_LOG_CHANNEL'),
'transport' => 'log',
],
'array' => [
'transport' => 'array',
],
'failover' => [
'mailers' => [
'smtp',
'log',
],
'transport' => 'failover',
],
],
/*
|--------------------------------------------------------------------------
@ -56,73 +91,8 @@ return [
*/
'from' => [
'address' => 'noreply@domain.tld',
'name' => 'Winter CMS',
'address' => env('MAIL_FROM_ADDRESS', 'noreply@example.com'),
'name' => env('MAIL_FROM_NAME', env('APP_NAME', 'Winter CMS')),
],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'encryption' => 'tls',
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'username' => null,
/*
|--------------------------------------------------------------------------
| 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' => null,
/*
|--------------------------------------------------------------------------
| Sendmail System Path
|--------------------------------------------------------------------------
|
| When using the "sendmail" driver to send e-mails, we will need to know
| the path to where Sendmail lives on this server. A default path has
| been provided here, which will work well on most of your systems.
|
*/
'sendmail' => '/usr/sbin/sendmail -bs',
/*
|--------------------------------------------------------------------------
| Log Channel
|--------------------------------------------------------------------------
|
| If you are using the "log" driver, you may specify the logging channel
| if you prefer to keep mail messages separate from other log entries
| for simpler reading. Otherwise, the default channel will be used.
|
*/
// 'log_channel' => env('MAIL_LOG_CHANNEL'),
];

View File

@ -7,13 +7,13 @@ return [
| Default Queue Connection Name
|--------------------------------------------------------------------------
|
| The Winter CMS queue API supports an assortment of back-ends via a single
| Winter'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 every one. Here you may define a default connection.
|
*/
'default' => 'sync',
'default' => env('QUEUE_CONNECTION', 'sync'),
/*
|--------------------------------------------------------------------------
@ -22,7 +22,7 @@ return [
|
| Here you may configure the connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
| for each back-end shipped with Winter. You are free to add more.
|
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
@ -35,35 +35,40 @@ return [
],
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'retry_after' => 90,
'after_commit' => false,
'driver' => 'database',
'queue' => 'default',
'retry_after' => 90,
'table' => 'jobs',
],
'beanstalkd' => [
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
'block_for' => 0,
'after_commit' => false,
'block_for' => 0,
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
],
'sqs' => [
'driver' => 'sqs',
'key' => '',
'secret' => '',
'prefix' => 'https://sqs.us-east-1.amazonaws.com/your-account-id',
'queue' => 'your-queue-name',
'region' => 'us-east-1',
'after_commit' => false,
'driver' => 'sqs',
'key' => env('AWS_ACCESS_KEY_ID'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'default'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'suffix' => env('SQS_SUFFIX'),
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'retry_after' => 90,
'block_for' => null,
'after_commit' => false,
'block_for' => null,
'connection' => 'default',
'driver' => 'redis',
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
],
],
@ -80,7 +85,8 @@ return [
*/
'failed' => [
'database' => 'mysql',
'database' => env('DB_CONNECTION', 'mysql'),
'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
'table' => 'failed_jobs',
],

View File

@ -8,39 +8,26 @@ return [
|--------------------------------------------------------------------------
|
| This file is for storing the credentials for third party services such
| as Stripe, Mailgun, Mandrill, and others. This file provides a sane
| default location for this type of information, allowing packages
| to have a conventional place to find your various credentials.
| as Mailgun, Postmark, AWS and more. This file provides the de facto
| location for this type of information, allowing packages to have
| a conventional file to locate the various service credentials.
|
*/
'mailgun' => [
'domain' => '',
'secret' => '',
'endpoint' => 'api.mailgun.net', // api.eu.mailgun.net for EU
],
'mandrill' => [
'secret' => '',
'domain' => env('MAILGUN_DOMAIN'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
'secret' => env('MAILGUN_SECRET'),
],
'postmark' => [
'token' => '',
'token' => env('POSTMARK_TOKEN'),
],
'ses' => [
'key' => '',
'secret' => '',
'region' => 'us-east-1',
],
'sparkpost' => [
'secret' => '',
],
'stripe' => [
'model' => 'User',
'secret' => '',
'key' => env('AWS_ACCESS_KEY_ID'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
],
];

View File

@ -16,7 +16,7 @@ return [
|
*/
'driver' => 'file',
'driver' => env('SESSION_DRIVER', 'file'),
/*
|--------------------------------------------------------------------------
@ -29,7 +29,7 @@ return [
|
*/
'lifetime' => 120,
'lifetime' => env('SESSION_LIFETIME', 120),
'expire_on_close' => false,
@ -70,7 +70,7 @@ return [
|
*/
'connection' => null,
'connection' => env('SESSION_CONNECTION'),
/*
|--------------------------------------------------------------------------
@ -90,13 +90,15 @@ return [
| Session Cache Store
|--------------------------------------------------------------------------
|
| When using the "apc", "memcached", or "dynamodb" session drivers you may
| While using one of the framework's cache driven session backends you may
| list a cache store that should be used for these sessions. This value
| must match with one of the application's configured cache "stores".
|
| Affects: "apc", "dynamodb", "memcached", "redis"
|
*/
'store' => null,
'store' => env('SESSION_STORE'),
/*
|--------------------------------------------------------------------------
@ -122,7 +124,10 @@ return [
|
*/
'cookie' => 'winter_session',
'cookie' => env(
'SESSION_COOKIE',
str_slug(env('APP_NAME', 'winter'), '_').'_session'
),
/*
|--------------------------------------------------------------------------
@ -148,7 +153,7 @@ return [
|
*/
'domain' => null,
'domain' => env('SESSION_DOMAIN'),
/*
|--------------------------------------------------------------------------
@ -170,11 +175,11 @@ return [
|
| By setting this option to true, session cookies will only be sent back
| to the server if the browser has a HTTPS connection. This will keep
| the cookie from being sent to you if it can not be done securely.
| the cookie from being sent to you when it can't be done securely.
|
*/
'secure' => false,
'secure' => env('SESSION_SECURE_COOKIE'),
/*
|--------------------------------------------------------------------------
@ -182,31 +187,32 @@ return [
|--------------------------------------------------------------------------
|
| This option determines how your cookies behave when cross-site requests
| take place and can be used to mitigate CSRF attacks.
| take place, and can be used to mitigate CSRF attacks. By default, we
| will set this value to "lax" since this is a secure default value.
|
| Cookies that match the domain of the current site, i.e. what's displayed
| in the browser's address bar, are referred to as first-party cookies.
| Similarly, cookies from domains other than the current site are referred
| to as third-party cookies.
|
| Cookies without a SameSite attribute will be treated as `SameSite=Lax`,
| Cookies without a SameSite attribute will be treated as `SameSite=lax`,
| meaning the default behaviour will be to restrict cookies to first party
| contexts only.
|
| Cookies for cross-site usage must specify `same_site` as 'None' and `secure`
| as `true` to work correctly.
|
| Lax - Cookies are allowed to be sent with top-level navigations and will
| lax - Cookies are allowed to be sent with top-level navigations and will
| be sent along with GET request initiated by third party website.
| This is the default value in modern browsers.
|
| Strict - Cookies will only be sent in a first-party context and not be
| strict - Cookies will only be sent in a first-party context and not be
| sent along with requests initiated by third party websites.
|
| Supported: "Lax", "Strict" and "None"
| Supported: "lax", "strict", "none", null
|
*/
'same_site' => 'Lax',
'same_site' => 'lax',
];

View File

@ -15,6 +15,7 @@ return [
'paths' => [
// Default Laravel Blade template location
// @see https://github.com/octobercms/october/issues/3473 & https://github.com/octobercms/october/issues/3459
// realpath(base_path('resources/views'))
],
@ -29,6 +30,9 @@ return [
|
*/
'compiled' => realpath(storage_path('framework/views')),
'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),
];