Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c8bee3c
Updated winter install command to use ConfigFile
jaxwilko Dec 1, 2021
b5f2b7e
Re-implemented winter:env using EnvFile
jaxwilko Dec 2, 2021
4af92de
Merge branch 'develop' into wip/config-file
jaxwilko Jan 14, 2022
b0cff6b
Added fix to when loading config values to write in env file
jaxwilko Jan 14, 2022
7b6244d
Updated test case with all strings being quoted
jaxwilko Jan 14, 2022
897263e
Run default config files through ConfigWriter to minimize changed lin…
LukeTowers Feb 17, 2022
5be10dd
Merge branch 'wip/1.2' into wip/config-file
LukeTowers Feb 17, 2022
eaf3d51
Bring in line with changes to the storm PR
LukeTowers Feb 17, 2022
d5871f3
Fix botched merge
LukeTowers Feb 17, 2022
674ee32
Fix winter:env test
LukeTowers Feb 17, 2022
c3bdfae
Run the default config through ArrayFile parser
LukeTowers Feb 17, 2022
33441c0
Revert changes to winter:install, ConfigWriter uses ArrayFile internally
LukeTowers Feb 18, 2022
8013a57
Revert "Run default config files through ConfigWriter to minimize cha…
LukeTowers Mar 4, 2022
f6c5bbf
Merge branch 'wip/1.2' into wip/config-write-replacement
LukeTowers Mar 4, 2022
745b4f6
Merge branch 'wip/1.2' into wip/config-write-replacement
jaxwilko Mar 4, 2022
fb142e6
Merge branch 'wip/config-file' into wip/config-write-replacement
jaxwilko Mar 4, 2022
1288d35
Merge branch 'wip/config-write-replacement' of github.com:wintercms/w…
LukeTowers Mar 5, 2022
70cfd90
Revert "Run the default config through ArrayFile parser"
LukeTowers Mar 16, 2022
140d388
Merge branch 'wip/1.2' into wip/config-write-replacement
LukeTowers Mar 16, 2022
520190f
Tweaks to be more friendly with the ArrayFile parser
LukeTowers Mar 16, 2022
3da0a32
Merge branch 'wip/config-write-replacement' into wip/config-file
LukeTowers Mar 16, 2022
cd9f909
Style fix
LukeTowers Mar 16, 2022
c137760
Run all config files through ArrayFile parser
LukeTowers Mar 16, 2022
f2d9526
Support new mail config file structure
LukeTowers Mar 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
*/

'key' => env('APP_KEY'),

'cipher' => 'AES-256-CBC',

/*
Expand All @@ -249,7 +248,7 @@

// 'Illuminate\Html\HtmlServiceProvider', // Example

'System\ServiceProvider',
System\ServiceProvider::class,
]),

/*
Expand Down Expand Up @@ -284,9 +283,6 @@
*/

'aliases' => array_merge(include(base_path('modules/system/aliases.php')), [

// 'Str' => 'Illuminate\Support\Str', // Example

]),

];
12 changes: 7 additions & 5 deletions config/auth.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

return [

'throttle' => [

/*
|--------------------------------------------------------------------------
| Enable throttling of Backend authentication attempts
Expand All @@ -11,7 +11,8 @@
| If set to true, users will be given a limited number of attempts to sign
| in to the Backend before being blocked for a specified number of minutes.
|
*/
*/

'enabled' => true,

/*
Expand All @@ -21,7 +22,8 @@
|
| Number of failed attempts allowed while trying to authenticate a user.
|
*/
*/

'attemptLimit' => 5,

/*
Expand All @@ -32,8 +34,8 @@
| The number of minutes to suspend further attempts on authentication once
| the attempt limit is reached.
|
*/
*/

'suspensionTime' => 15,
],

];
23 changes: 8 additions & 15 deletions config/broadcasting.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,39 +29,32 @@
*/

'connections' => [

'pusher' => [
'app_id' => env('PUSHER_APP_ID'),
'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' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
'useTLS' => true,
],
'secret' => env('PUSHER_APP_SECRET'),
'secret' => env('PUSHER_APP_SECRET'),
],

'ably' => [
'driver' => 'ably',
'key' => env('ABLY_KEY'),
'key' => env('ABLY_KEY'),
],

'redis' => [
'connection' => 'default',
'driver' => 'redis',
'driver' => 'redis',
],

'log' => [
'driver' => 'log',
],

'null' => [
'driver' => 'null',
],

],

];
42 changes: 16 additions & 26 deletions config/cache.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,66 +35,57 @@
*/

'stores' => [

'apc' => [
'driver' => 'apc',
],

'array' => [
'driver' => 'array',
'driver' => 'array',
'serialize' => false,
],

'database' => [
'connection' => null,
'driver' => 'database',
'connection' => null,
'driver' => 'database',
'lock_connection' => null,
'table' => 'cache',
'table' => 'cache',
],

'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache'),
'path' => storage_path('framework/cache'),
],

'memcached' => [
'driver' => 'memcached',
'options' => [
'driver' => 'memcached',
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'servers' => [
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],

'redis' => [
'connection' => 'cache',
'driver' => 'redis',
'connection' => 'cache',
'driver' => 'redis',
'lock_connection' => 'default',
],

'dynamodb' => [
'driver' => 'dynamodb',
'driver' => 'dynamodb',
'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'),
'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',
],

],

/*
Expand All @@ -108,7 +99,7 @@
|
*/

'prefix' => env('CACHE_PREFIX', str_slug(env('APP_NAME', 'winter'), '_').'_cache'),
'prefix' => env('CACHE_PREFIX', str_slug(env('APP_NAME', 'winter'), '_') . '_cache'),

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -145,5 +136,4 @@
*/

'disableRequestCache' => null,

];
32 changes: 17 additions & 15 deletions config/cms.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
|
*/

'backendSkin' => 'Backend\Skins\Standard',
'backendSkin' => \Backend\Skins\Standard::class,

/*
|--------------------------------------------------------------------------
Expand All @@ -117,7 +117,11 @@
|
*/

'loadModules' => ['System', 'Backend', 'Cms'],
'loadModules' => [
'System',
'Backend',
'Cms',
],

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -312,26 +316,22 @@
*/

'storage' => [

'uploads' => [
'disk' => 'local',
'folder' => 'uploads',
'path' => '/storage/app/uploads',
'disk' => 'local',
'folder' => 'uploads',
'path' => '/storage/app/uploads',
'temporaryUrlTTL' => 3600,
],

'media' => [
'disk' => 'local',
'disk' => 'local',
'folder' => 'media',
'path' => '/storage/app/media',
'path' => '/storage/app/media',
],

'resized' => [
'disk' => 'local',
'disk' => 'local',
'folder' => 'resized',
'path' => '/storage/app/resized',
'path' => '/storage/app/resized',
],

],

/*
Expand Down Expand Up @@ -371,7 +371,10 @@
|
*/

'defaultMask' => ['file' => null, 'folder' => null],
'defaultMask' => [
'file' => null,
'folder' => null,
],

/*
|--------------------------------------------------------------------------
Expand Down Expand Up @@ -466,5 +469,4 @@
*/

'enableBackendServiceWorkers' => false,

];
1 change: 0 additions & 1 deletion config/cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@
'unencryptedCookies' => [
// 'my_cookie',
],

];
Loading