diff --git a/.env.example b/.env.example index fbf507152..b6ce94ee7 100644 --- a/.env.example +++ b/.env.example @@ -32,4 +32,4 @@ QUEUE_HIGH=high QUEUE_STANDARD=standard QUEUE_LOW=low -SERVICE_AUTHOR=undefined@unknown-author.com +APP_SERVICE_AUTHOR=undefined@unknown-author.com diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php index 709ed226d..e0dba73f9 100644 --- a/app/Console/Commands/Environment/AppSettingsCommand.php +++ b/app/Console/Commands/Environment/AppSettingsCommand.php @@ -73,8 +73,8 @@ class AppSettingsCommand extends Command public function handle() { $this->output->comment(trans('command/messages.environment.app.author_help')); - $this->variables['SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask( - trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'undefined@unknown-author.com') + $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask( + trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'unknown@unknown.com') ); $this->output->comment(trans('command/messages.environment.app.app_url_help')); @@ -98,7 +98,7 @@ class AppSettingsCommand extends Command trans('command/messages.environment.app.session_driver'), [ 'redis' => 'Redis (recommended)', 'memcached' => 'Memcached', - 'mysql' => 'MySQL Database', + 'database' => 'MySQL Database', 'file' => 'Filesystem', 'cookie' => 'Cookie', ], $this->config->get('session.driver', 'redis') diff --git a/config/pterodactyl.php b/config/pterodactyl.php index 6df7056e5..77667a80b 100644 --- a/config/pterodactyl.php +++ b/config/pterodactyl.php @@ -11,7 +11,7 @@ return [ | standard Pterodactyl shipped services. */ 'service' => [ - 'author' => env('SERVICE_AUTHOR', 'unknown@unknown.com'), + 'author' => env('APP_SERVICE_AUTHOR', 'unknown@unknown.com'), ], /* diff --git a/resources/lang/en/command/messages.php b/resources/lang/en/command/messages.php index 9f3f5e856..a6385abc4 100644 --- a/resources/lang/en/command/messages.php +++ b/resources/lang/en/command/messages.php @@ -74,6 +74,8 @@ return [ 'try_again' => 'Go back and try again?', ], 'app' => [ + 'author' => 'Egg Author Email', + 'author_help' => 'Provide the email address that eggs exported by this Panel should be from. This should be a valid email address.', 'app_url_help' => 'The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.', 'app_url' => 'Application URL', 'timezone_help' => 'The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference http://php.net/manual/en/timezones.php.',