Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix setup command issues

Browse source
This commit is contained in:
Dane Everitt 2017-11-04 16:27:15 -05:00
parent df9d746b4b
commit 69cd330eb8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env.example
View file

@ -32,4 +32,4 @@ QUEUE_HIGH=high
QUEUE_STANDARD=standard QUEUE_STANDARD=standard
QUEUE_LOW=low QUEUE_LOW=low
SERVICE_AUTHOR=undefined@unknown-author.com APP_SERVICE_AUTHOR=undefined@unknown-author.com

6
app/Console/Commands/Environment/AppSettingsCommand.php
View file

@ -73,8 +73,8 @@ class AppSettingsCommand extends Command
public function handle() public function handle()
{ {
$this->output->comment(trans('command/messages.environment.app.author_help')); $this->output->comment(trans('command/messages.environment.app.author_help'));
$this->variables['SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask( $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'undefined@unknown-author.com') 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')); $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'), [ trans('command/messages.environment.app.session_driver'), [
'redis' => 'Redis (recommended)', 'redis' => 'Redis (recommended)',
'memcached' => 'Memcached', 'memcached' => 'Memcached',
'mysql' => 'MySQL Database', 'database' => 'MySQL Database',
'file' => 'Filesystem', 'file' => 'Filesystem',
'cookie' => 'Cookie', 'cookie' => 'Cookie',
], $this->config->get('session.driver', 'redis') ], $this->config->get('session.driver', 'redis')

2
config/pterodactyl.php
View file

@ -11,7 +11,7 @@ return [
| standard Pterodactyl shipped services. | standard Pterodactyl shipped services.
*/ */
'service' => [ 'service' => [
'author' => env('SERVICE_AUTHOR', 'unknown@unknown.com'), 'author' => env('APP_SERVICE_AUTHOR', 'unknown@unknown.com'),
], ],
/* /*

2
resources/lang/en/command/messages.php
View file

@ -74,6 +74,8 @@ return [
'try_again' => 'Go back and try again?', 'try_again' => 'Go back and try again?',
], ],
'app' => [ '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_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', '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.', '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.',