MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 22:33:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Dane Everitt
2020-10-12 18:29:11 -07:00
parent fd89d86a5e d795668fc2
commit 8288d5ec89
1166 changed files with 43858 additions and 37199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/app.php
View File

@@ -9,7 +9,7 @@ return [
| change this value if you are not maintaining your own internal versions.
*/
'version' => '0.7.17',
'version' => '1.0.0',
/*
|--------------------------------------------------------------------------

39
config/backups.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
use Pterodactyl\Models\Backup;
return [
// The backup driver to use for this Panel instance. All client generated server backups
// will be stored in this location by default. It is possible to change this once backups
// have been made, without losing data.
'default' => env('APP_BACKUP_DRIVER', Backup::ADAPTER_WINGS),
'disks' => [
// There is no configuration for the local disk for Wings. That configuration
// is determined by the Daemon configuration, and not the Panel.
'wings' => [
'adapter' => Backup::ADAPTER_WINGS,
],
// Configuration for storing backups in Amazon S3. This uses the same credentials
// specified in filesystems.php but does include some more specific settings for
// backups, notably bucket, location, and use_accelerate_endpoint.
's3' => [
'adapter' => Backup::ADAPTER_AWS_S3,
'region' => env('AWS_DEFAULT_REGION'),
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
// The S3 bucket to use for backups.
'bucket' => env('AWS_BACKUPS_BUCKET'),
// The location within the S3 bucket where backups will be stored. Backups
// are stored within a folder using the server's UUID as the name. Each
// backup for that server lives within that folder.
'prefix' => env('AWS_BACKUPS_BUCKET') ?? '',
'use_accelerate_endpoint' => env('AWS_BACKUPS_USE_ACCELERATE', false),
],
],
];

4
config/database.php
View File

@@ -96,6 +96,8 @@ return [
'client' => 'predis',
'default' => [
'scheme' => env('REDIS_SCHEME', 'tcp'),
'path' => env('REDIS_PATH', '/run/redis/redis.sock'),
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
@@ -103,6 +105,8 @@ return [
],
'sessions' => [
'scheme' => env('REDIS_SCHEME', 'tcp'),
'path' => env('REDIS_PATH', '/run/redis/redis.sock'),
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),

21
config/http.php Normal file
View File

@@ -0,0 +1,21 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| API Rate Limits
|--------------------------------------------------------------------------
|
| Defines the rate limit for the number of requests per minute that can be
| executed against both the client and internal (application) APIs over the
| defined period (by default, 1 minute).
|
*/
'rate_limit' => [
'client_period' => 1,
'client' => env('APP_API_CLIENT_RATELIMIT', 240),
'application_period' => 1,
'application' => env('APP_API_APPLICATION_RATELIMIT', 240),
],
];

4
config/ide-helper.php
View File

@@ -168,8 +168,8 @@ return [
| Cast the given "real type" to the given "type".
|
*/
'type_overrides' => [
'type_overrides' => [
'integer' => 'int',
'boolean' => 'bool',
],
],
];

56
config/laroute.php
View File

@@ -1,56 +0,0 @@
<?php
return [
/*
* The destination path for the javascript file.
*/
'path' => 'public/js',
/*
* The destination filename for the javascript file.
*/
'filename' => 'laroute',
/*
* The namespace for the helper functions. By default this will bind them to
* `window.laroute`.
*/
'namespace' => 'Router',
/*
* Generate absolute URLs
*
* Set the Application URL in config/app.php
*/
'absolute' => false,
/*
* The Filter Method
*
* 'all' => All routes except "'laroute' => false"
* 'only' => Only "'laroute' => true" routes
* 'force' => All routes, ignored "laroute" route parameter
*/
'filter' => 'all',
/*
* Controller Namespace
*
* Set here your controller namespace (see RouteServiceProvider -> $namespace) for cleaner action calls
* e.g. 'App\Http\Controllers'
*/
'action_namespace' => '',
/*
* The path to the template `laroute.js` file. This is the file that contains
* the ported helper Laravel url/route functions and the route data to go
* with them.
*/
'template' => 'vendor/lord/laroute/src/templates/laroute.js',
/*
* Appends a prefix to URLs. By default the prefix is an empty string.
*
*/
'prefix' => '',
];

8
config/logging.php
View File

@@ -1,9 +1,9 @@
<?php
use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler;
return [
/*
|--------------------------------------------------------------------------
| Default Log Channel
@@ -76,6 +76,10 @@ return [
'driver' => 'errorlog',
'level' => 'debug',
],
],
'null' => [
'driver' => 'monolog',
'handler' => NullHandler::class,
],
],
];

66
config/pterodactyl.php
View File

@@ -10,7 +10,7 @@ return [
| setup on the panel. When set to true, configurations stored in the
| database will not be applied.
*/
'load_environment_only' => (bool) env('APP_ENVIRONMENT_ONLY', false),
'load_environment_only' => (bool)env('APP_ENVIRONMENT_ONLY', false),
/*
|--------------------------------------------------------------------------
@@ -56,7 +56,6 @@ return [
'admin' => [
'servers' => env('APP_PAGINATE_ADMIN_SERVERS', 25),
'users' => env('APP_PAGINATE_ADMIN_USERS', 25),
'packs' => env('APP_PAGINATE_ADMIN_PACKS', 50),
],
'api' => [
'nodes' => env('APP_PAGINATE_API_NODES', 25),
@@ -85,8 +84,8 @@ return [
| Configure the timeout to be used for Guzzle connections here.
*/
'guzzle' => [
'timeout' => env('GUZZLE_TIMEOUT', 5),
'connect_timeout' => env('GUZZLE_CONNECT_TIMEOUT', 3),
'timeout' => env('GUZZLE_TIMEOUT', 30),
'connect_timeout' => env('GUZZLE_CONNECT_TIMEOUT', 10),
],
/*
@@ -102,29 +101,6 @@ return [
'high' => env('QUEUE_HIGH', 'high'),
],
/*
|--------------------------------------------------------------------------
| Console Configuration
|--------------------------------------------------------------------------
|
| Configure the speed at which data is rendered to the console.
*/
'console' => [
'count' => env('CONSOLE_PUSH_COUNT', 10),
'frequency' => env('CONSOLE_PUSH_FREQ', 200),
],
/*
|--------------------------------------------------------------------------
| Daemon Connection Details
|--------------------------------------------------------------------------
|
| Configuration for support of the new Golang based daemon.
*/
'daemon' => [
'use_new_daemon' => (bool) env('APP_USE_NEW_DAEMON', false),
],
/*
|--------------------------------------------------------------------------
| Task Timers
@@ -162,6 +138,11 @@ return [
'enabled' => env('PTERODACTYL_CLIENT_DATABASES_ENABLED', true),
'allow_random' => env('PTERODACTYL_CLIENT_DATABASES_ALLOW_RANDOM', true),
],
'schedules' => [
// The total number of tasks that can exist for any given schedule at once.
'per_schedule_task_limit' => 10,
],
],
/*
@@ -172,21 +153,7 @@ return [
| This array includes the MIME filetypes that can be edited via the web.
*/
'files' => [
'max_edit_size' => env('PTERODACTYL_FILES_MAX_EDIT_SIZE', 50000),
'editable' => [
'application/json',
'application/javascript',
'application/xml',
'application/xhtml+xml',
'inode/x-empty',
'text/xml',
'text/css',
'text/html',
'text/plain',
'text/x-perl',
'text/x-shellscript',
'text/x-python',
],
'max_edit_size' => env('PTERODACTYL_FILES_MAX_EDIT_SIZE', 1024 * 1024 * 4),
],
/*
@@ -218,5 +185,18 @@ return [
|
| 'P_SERVER_CREATED_AT' => 'created_at'
*/
'environment_variables' => [],
'environment_variables' => [
'P_SERVER_ALLOCATION_LIMIT' => 'allocation_limit',
],
/*
|--------------------------------------------------------------------------
| Asset Verification
|--------------------------------------------------------------------------
|
| This section controls the output format for JS & CSS assets.
*/
'assets' => [
'use_hash' => env('PTERODACTYL_USE_ASSET_HASH', false),
],
];

2
config/session.php
View File

@@ -28,7 +28,7 @@ return [
|
*/
'lifetime' => env('SESSION_LIFETIME', 10080),
'lifetime' => env('SESSION_LIFETIME', 720),
'expire_on_close' => false,

63
config/themes.php
View File

@@ -1,63 +0,0 @@
<?php
return [
'enabled' => true,
/*
|--------------------------------------------------------------------------
| Root path where theme Views will be located.
| Can be outside default views path e.g.: resources/themes
| Leave it null if you will put your themes in the default views folder
| (as defined in config\views.php)
|--------------------------------------------------------------------------
*/
'themes_path' => realpath(base_path('resources/themes')),
/*
|--------------------------------------------------------------------------
| Set behavior if an asset is not found in a Theme hierarchy.
| Available options: THROW_EXCEPTION | LOG_ERROR | IGNORE
|--------------------------------------------------------------------------
*/
'asset_not_found' => 'LOG_ERROR',
/*
|--------------------------------------------------------------------------
| Do we want a theme activated by default? Can be set at runtime with:
| Theme::set('theme-name');
|--------------------------------------------------------------------------
*/
'default' => env('APP_THEME', 'pterodactyl'),
/*
|--------------------------------------------------------------------------
| Cache theme.json configuration files that are located in each theme's folder
| in order to avoid searching theme settings in the filesystem for each request
|--------------------------------------------------------------------------
*/
'cache' => true,
/*
|--------------------------------------------------------------------------
| Define available themes. Format:
|
| 'theme-name' => [
| 'extends' => 'theme-to-extend', // optional
| 'views-path' => 'path-to-views', // defaults to: resources/views/theme-name
| 'asset-path' => 'path-to-assets', // defaults to: public/theme-name
|
| // You can add your own custom keys
| // Use Theme::getSetting('key') & Theme::setSetting('key', 'value') to access them
| 'key' => 'value',
| ],
|
|--------------------------------------------------------------------------
*/
'themes' => [
'pterodactyl' => [
'extends' => null,
'views-path' => 'pterodactyl',
'asset-path' => 'themes/pterodactyl',
],
],
];

50
config/vue-i18n-generator.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Laravel translations path
|--------------------------------------------------------------------------
|
| The default path where the translations are stored by Laravel.
| Note: the path will be prepended to point to the App directory.
|
*/
'langPath' => '/resources/lang',
/*
|--------------------------------------------------------------------------
| Laravel translation files
|--------------------------------------------------------------------------
|
| You can choose which translation files to be generated.
| Note: leave this empty for all the translation files to be generated.
|
*/
'langFiles' => [],
/*
|--------------------------------------------------------------------------
| Output file
|--------------------------------------------------------------------------
|
| The javascript path where I will place the generated file.
| Note: the path will be prepended to point to the App directory.
|
*/
'jsPath' => '/resources/lang/i18n',
'jsFile' => '/resources/lang/locales.js',
/*
|--------------------------------------------------------------------------
| i18n library
|--------------------------------------------------------------------------
|
| Specify the library you use for localization.
| Options are vue-i18n or vuex-i18n.
|
*/
'i18nLib' => 'vuex-i18n',
];