diff --git a/.env.example b/.env.example index c979b4e52..3db40f368 100644 --- a/.env.example +++ b/.env.example @@ -23,7 +23,7 @@ REDIS_PASSWORD=null REDIS_PORT=6379 CACHE_STORE=file -QUEUE_CONNECTION=redis +QUEUE_CONNECTION=sync SESSION_DRIVER=file HASHIDS_SALT= @@ -36,7 +36,7 @@ MAIL_USERNAME= MAIL_PASSWORD= MAIL_ENCRYPTION=tls MAIL_FROM_ADDRESS=no-reply@example.com -MAIL_FROM_NAME="Panel Administrator" +MAIL_FROM_NAME="Pelican Admin" # Set this to your domain to prevent it defaulting to 'localhost', causing mail servers such as Gmail to reject your mail # MAIL_EHLO_DOMAIN=panel.example.com SESSION_ENCRYPT=false diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php index 343130168..c1f857f4e 100644 --- a/app/Console/Commands/Environment/AppSettingsCommand.php +++ b/app/Console/Commands/Environment/AppSettingsCommand.php @@ -11,23 +11,23 @@ class AppSettingsCommand extends Command use EnvironmentWriterTrait; public const CACHE_DRIVERS = [ - 'redis' => 'Redis (recommended)', + 'redis' => 'Redis', 'memcached' => 'Memcached', - 'file' => 'Filesystem', + 'file' => 'Filesystem (recommended)', ]; public const SESSION_DRIVERS = [ - 'redis' => 'Redis (recommended)', + 'redis' => 'Redis', 'memcached' => 'Memcached', 'database' => 'MySQL Database', - 'file' => 'Filesystem', + 'file' => 'Filesystem (recommended)', 'cookie' => 'Cookie', ]; public const QUEUE_DRIVERS = [ - 'redis' => 'Redis (recommended)', + 'redis' => 'Redis', 'database' => 'MySQL Database', - 'sync' => 'Sync', + 'sync' => 'Sync (recommended)', ]; protected $description = 'Configure basic environment settings for the Panel.'; @@ -91,21 +91,21 @@ class AppSettingsCommand extends Command config('app.timezone') ); - $selected = config('cache.default', 'redis'); + $selected = config('cache.default', 'file'); $this->variables['CACHE_STORE'] = $this->option('cache') ?? $this->choice( 'Cache Driver', self::CACHE_DRIVERS, array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null ); - $selected = config('session.driver', 'redis'); + $selected = config('session.driver', 'file'); $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice( 'Session Driver', self::SESSION_DRIVERS, array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null ); - $selected = config('queue.default', 'redis'); + $selected = config('queue.default', 'sync'); $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice( 'Queue Driver', self::QUEUE_DRIVERS,