Merge branch 'develop' into integrations/2020-04-15-v5-merge

# Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js
2020-04-20 23:20:34 -07:00
parent 154db9a416 039f5da0e1
commit 87464e6ec0
1780 changed files with 116525 additions and 290164 deletions
@@ -256,6 +256,18 @@ return [
    'lock_passwords' => env('APP_LOCKED', false),


+    /*
+    |--------------------------------------------------------------------------
+    | Minimum PHP version
+    |--------------------------------------------------------------------------
+    |
+    | Do not change this variable.
+    |
+    */
+
+    'min_php' => '7.1.3',
+
+
    /*
    |--------------------------------------------------------------------------
    | Autoloaded Service Providers
@@ -307,7 +319,7 @@ return [
        Laravel\Passport\PassportServiceProvider::class,
        Laravel\Tinker\TinkerServiceProvider::class,
        Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
-        Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
+        //Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
        Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
        Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,

@@ -326,6 +338,7 @@ return [
        * Custom service provider
        */
        App\Providers\MacroServiceProvider::class,
+        App\Providers\LdapServiceProvider::class,


    ],
@@ -375,12 +388,12 @@ return [
        'URL' => Illuminate\Support\Facades\URL::class,
        'Validator' => Illuminate\Support\Facades\Validator::class,
        'View' => Illuminate\Support\Facades\View::class,
-        'Input' => Illuminate\Support\Facades\Input::class,
+        //'Input' => Illuminate\Support\Facades\Input::class,
        'Form'      => Collective\Html\FormFacade::class,
        'Html'      => Collective\Html\HtmlFacade::class,
-        'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class,
-        'Debugbar' => Barryvdh\Debugbar\Facade::class,
-        'Image'     => Intervention\Image\ImageManagerStatic::class,
+        'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
+        // 'Debugbar' => Barryvdh\Debugbar\Facade::class, //autodiscover should handle this
+        'Image'     => Intervention\Image\ImageServiceProvider::class,
        'Carbon' => Carbon\Carbon::class,


@@ -53,6 +53,7 @@ return [
        'api' => [
            'driver' => 'passport',
            'provider' => 'users',
+            'hash' => false,
        ],
    ],

@@ -86,10 +87,6 @@ return [
    | Resetting Passwords
    |--------------------------------------------------------------------------
    |
-    | Here you may set the options for resetting passwords including the view
-    | that is your password reset e-mail. You may also set the name of the
-    | table that maintains all of the reset tokens for your application.
-    |
    | You may specify multiple password reset configurations if you have more
    | than one user table or model in the application and you want to have
    | separate password reset settings based on the specific user types.
@@ -105,25 +102,22 @@ return [
            'provider' => 'users',
            'email' => 'auth.emails.password',
            'table' => 'password_resets',
-            'expire' => 60,
+            'expire' => env('LOGIN_LOCKOUT_DURATION', 60),
+            'throttle' => env('LOGIN_MAX_ATTEMPTS', 60),
        ],
    ],

    /*
-   |--------------------------------------------------------------------------
-   | Login throttling
-   |--------------------------------------------------------------------------
-   |
-   | This handles the max failed login attempt throttling.
-   | You should not change the values here, but should change them in your
-   | application's .env file instead, as future changes to this file could
-   | overwrite your changes here.
-   |
-   */
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */

-    'throttle' => [
-        'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 10),
-        'lockout_duration' =>  env('LOGIN_LOCKOUT_DURATION', 60),
-    ],
+    'password_timeout' => 10800,

 ];
@@ -1,5 +1,14 @@
 <?php

+/*
+ |--------------------------------------------------------------------------
+ | DO NOT EDIT THIS FILE DIRECTLY.
+ |--------------------------------------------------------------------------
+ | This file reads from your .env configuration file and should not
+ | be modified directly.
+*/
+
+
 // This is janky, but necessary to figure out whether to include the .env in the backup
 $included_dirs = [
    base_path('public/uploads'),
@@ -82,11 +82,14 @@ return [
            'unix_socket' => env('DB_SOCKET',''),
            'dump' => [
                'dump_binary_path' => env('DB_DUMP_PATH', '/usr/local/bin'),  // only the path, so without 'mysqldump'
-                'use_single_transaction',
+                'use_single_transaction' => false,
                'timeout' => 60 * 5, // 5 minute timeout
                //'exclude_tables' => ['table1', 'table2'],
                //'add_extra_option' => '--optionname=optionvalue',
            ],
+
+            'dump_command_timeout' => 60 * 5, // 5 minute timeout
+            'dump_using_single_transaction' => true, // perform dump using a single transaction
            'options' => (env('DB_SSL')) ? ((env('DB_SSL_IS_PAAS')) ? [
                PDO::MYSQL_ATTR_SSL_CA                  => env('DB_SSL_CA_PATH'),   // /path/to/ca.pem
            ] : [
@@ -1,15 +1,6 @@
 <?php

-/*
- |--------------------------------------------------------------------------
- | DO NOT EDIT THIS FILE DIRECTLY.
- |--------------------------------------------------------------------------
- | This file reads from your .env configuration file and should not
- | be modified directly.
-*/
-
-
-return [
+$config = [

    /*
    |--------------------------------------------------------------------------
@@ -17,10 +8,8 @@ return [
    |--------------------------------------------------------------------------
    |
    | Here you may specify the default filesystem disk that should be used
-    | by the framework. A "local" driver, as well as a variety of cloud
-    | based drivers are available for your choosing. Just store away!
-    |
-    | Supported: "local", "ftp", "s3", "rackspace"
+    | by the framework. The "local" disk, as well as a variety of cloud
+    | based disks are available to your application. Just store away!
    |
    */

@@ -37,7 +26,7 @@ return [
    |
    */

-    'cloud' => 's3',
+    'cloud' => env('FILESYSTEM_CLOUD', 's3'),

    /*
    |--------------------------------------------------------------------------
@@ -48,47 +37,54 @@ return [
    | may even configure multiple disks of the same driver. Defaults have
    | been setup for each driver as an example of the required options.
    |
+    | Supported Drivers: "local", "ftp", "sftp", "s3", "rackspace"
+    |
    */

    'disks' => [

        'local' => [
            'driver' => 'local',
-            'root'   => storage_path('app'),
+            'root' => storage_path('app'),
        ],

-        'ftp' => [
-            'driver'   => 'ftp',
-            'host'     => 'ftp.example.com',
-            'username' => 'your-username',
-            'password' => 'your-password',
-
-            // Optional FTP Settings...
-            // 'port'     => 21,
-            // 'root'     => '',
-            // 'passive'  => true,
-            // 'ssl'      => true,
-            // 'timeout'  => 30,
+        // This applies the LOCAL public only, not S3/FTP/etc
+        'public' => [
+            'driver' => 'local',
+            'root' => public_path('uploads'),
+            'url' => env('APP_URL').'/uploads',
+            'visibility' => 'public',
        ],

        's3' => [
            'driver' => 's3',
-            'key'    => env('AWS_KEY', null),
-            'secret' => env('AWS_SECRET', null),
-            'region' => env('AWS_REGION', null),
-            'bucket' => env('AWS_BUCKET', null),
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_DEFAULT_REGION'),
+            'bucket' => env('AWS_BUCKET'),
+            'url' => env('AWS_URL'),
+            'root'   => env('AWS_BUCKET_ROOT'),
        ],

        'rackspace' => [
            'driver'    => 'rackspace',
-            'username'  => 'your-username',
-            'key'       => 'your-key',
-            'container' => 'your-container',
+            'username'  => env('RACKSPACE_USERNAME'),
+            'key'       => env('RACKSPACE_KEY'),
+            'container' => env('RACKSPACE_CONTAINER'),
            'endpoint'  => 'https://identity.api.rackspacecloud.com/v2.0/',
-            'region'    => 'IAD',
-            'url_type'  => 'publicURL',
+            'region'    => env('RACKSPACE_REGION'),
+            'url_type'  => env('RACKSPACE_URL_TYPE'),
        ],

    ],

 ];
+
+// When you're dealing with local file storage, the paths will be different than S3
+if  (env('FILESYSTEM_DISK','local')!='local')
+{
+    $config['disks']['public'] = $config['disks'][env('FILESYSTEM_DISK')];
+    $config['disks']['public']['visibility'] = 'public';
+}
+
+return $config;
@@ -0,0 +1,52 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Hash Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default hash driver that will be used to hash
+    | passwords for your application. By default, the bcrypt algorithm is
+    | used; however, you remain free to modify this option if you wish.
+    |
+    | Supported: "bcrypt", "argon"
+    |
+    */
+
+    'driver' => 'bcrypt',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Bcrypt Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Bcrypt algorithm. This will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'bcrypt' => [
+        'rounds' => env('BCRYPT_ROUNDS', 10),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Argon Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Argon algorithm. These will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'argon' => [
+        'memory' => 1024,
+        'threads' => 2,
+        'time' => 2,
+    ],
+
+];
@@ -0,0 +1,81 @@
+<?php
+
+use Monolog\Handler\StreamHandler;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option defines the default log channel that gets used when writing
+    | messages to the logs. The name specified in this option should match
+    | one of the channels defined in the "channels" configuration array.
+    |
+    */
+
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Channels
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log channels for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Drivers: "single", "daily", "slack", "syslog",
+    |                    "errorlog", "monolog",
+    |                    "custom", "stack"
+    |
+    */
+
+    'channels' => [
+        'stack' => [
+            'driver' => 'stack',
+            'channels' => ['single'],
+        ],
+
+        'single' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => env('APP_LOG_LEVEL', 'error'),
+        ],
+
+        'daily' => [
+            'driver' => 'daily',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' =>  env('APP_LOG_MAX_FILES', 5),
+        ],
+
+        'slack' => [
+            'driver' => 'slack',
+            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'username' => 'Laravel Log',
+            'emoji' => ':boom:',
+            'level' => 'critical',
+        ],
+
+        'stderr' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'with' => [
+                'stream' => 'php://stderr',
+            ],
+        ],
+
+        'syslog' => [
+            'driver' => 'syslog',
+            'level' => env('APP_LOG_LEVEL', 'error'),
+        ],
+
+        'errorlog' => [
+            'driver' => 'errorlog',
+            'level' => env('APP_LOG_LEVEL', 'error'),
+        ],
+    ],
+
+];
@@ -0,0 +1,28 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail auto embed
+    |--------------------------------------------------------------------------
+    |
+    | If true, images will be automatically embedded.
+    | If false, only images with the 'data-auto-embed' attribute will be embedded
+    |
+    */
+
+    'enabled' => env('MAIL_AUTO_EMBED', true),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Mail embed method
+    |--------------------------------------------------------------------------
+    |
+    | Supported: "attachment", "base64"
+    |
+    */
+
+    'method' => env('MAIL_AUTO_EMBED_METHOD', 'base64'),
+
+];
@@ -0,0 +1,15 @@
+<?php
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Encryption Keys
+    |--------------------------------------------------------------------------
+    |
+    | Passport uses encryption keys while generating secure access tokens for
+    | your application. By default, the keys are stored as local files but
+    | can be set via environment variables when that is more convenient.
+    |
+    */
+    'private_key' => env('PASSPORT_PRIVATE_KEY'),
+    'public_key' => env('PASSPORT_PUBLIC_KEY'),
+];
@@ -261,6 +261,41 @@ return array(

    ),

+    'Kits' => array(
+        array(
+            'permission' => 'kits.view',
+            'label'      => 'View ',
+            'note'       => 'These are predefined kits that can be used to quickly checkout assets, licenses, etc.',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'kits.create',
+            'label'      => 'Create ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'kits.edit',
+            'label'      => 'Edit  ',
+            'note'       => '',
+            'display'    => true,
+        ),
+        array(
+            'permission' => 'kits.delete',
+            'label'      => 'Delete ',
+            'note'       => '',
+            'display'    => true,
+        ),
+
+        array(
+            'permission' => 'kits.checkout',
+            'label'      => 'Checkout ',
+            'note'       => '',
+            'display'    => true,
+        ),
+    ),
+
+
    'Users' => array(
        array(
            'permission' => 'users.view',
@@ -587,6 +622,13 @@ return array(
            'display'    => true,
        ),

+        array(
+            'permission' => 'self.checkout_assets',
+            'label'      => 'Self-Checkout',
+            'note'       => 'This user may check out assets that are marked for self-checkout.',
+            'display'    => true,
+        ),
+
    ),


@@ -67,7 +67,7 @@ return [
    |
    */

-    'files' => storage_path('framework/sessions'),
+    'files' => (env('SESSION_PATH')!='' ?  env('SESSION_PATH') : storage_path('framework/sessions')),

    /*
    |--------------------------------------------------------------------------
@@ -21,7 +21,7 @@ return [
     * within TrustedProxy to trust any proxy
     * that connects directly to your server,
     * a requirement when you cannot know the address
-     * of your proxy (e.g. if using Rackspace balancers).
+     * of your proxy (e.g. if using ELB or similar).
     *
     * The "**" character is syntactic sugar within
     * TrustedProxy to trust not just any proxy that
@@ -33,42 +33,31 @@ return [
     * how many proxies that client's request has
     * subsequently passed through.
     */
-    'proxies' => env('APP_TRUSTED_PROXIES') !== null ?
-        explode(',', env('APP_TRUSTED_PROXIES')) : '*',
+    'proxies' => null, // [<ip addresses>,], '*'
+
+    /*
+     * To trust one or more specific proxies that connect
+     * directly to your server, use an array of IP addresses:
+     */
+    # 'proxies' => ['192.168.1.1'],

    /*
     * Or, to trust all proxies that connect
-     * directly to your server, uncomment this:
+     * directly to your server, use a "*"
     */
-    // 'proxies' => '*',
+    # 'proxies' => '*',

    /*
-     * Or, to trust ALL proxies, including those that
-     * are in a chain of forwarding, uncomment this:
-    */
-    // 'proxies' => '**',
-
-    /*
-     * Default Header Names
+     * Which headers to use to detect proxy related data (For, Host, Proto, Port)
     *
-     * Change these if the proxy does
-     * not send the default header names.
+     * Options include:
     *
-     * Note that headers such as X-Forwarded-For
-     * are transformed to HTTP_X_FORWARDED_FOR format.
+     * - Illuminate\Http\Request::HEADER_X_FORWARDED_ALL (use all x-forwarded-* headers to establish trust)
+     * - Illuminate\Http\Request::HEADER_FORWARDED (use the FORWARDED header to establish trust)
     *
-     * The following are Symfony defaults, found in
-     * \Symfony\Component\HttpFoundation\Request::$trustedHeaders
-     *
-     * We may also want to add something like:
-     * \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_SCHEME',
+     * @link https://symfony.com/doc/current/deployment/proxies.html
     */
-    // These are defaults already set in the config:
-    'headers' => [
-        (defined('Illuminate\Http\Request::HEADER_FORWARDED') ? Illuminate\Http\Request::HEADER_FORWARDED : 'forwarded') => 'FORWARDED',
-        \Illuminate\Http\Request::HEADER_CLIENT_IP    => 'X_FORWARDED_FOR',
-        \Illuminate\Http\Request::HEADER_CLIENT_HOST  => 'X_FORWARDED_HOST',
-        \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
-        \Illuminate\Http\Request::HEADER_CLIENT_PORT  => 'X_FORWARDED_PORT',
-    ]
+    'headers' => Illuminate\Http\Request::HEADER_X_FORWARDED_ALL,
+
+
 ];
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.9.2',
-  'full_app_version' => 'v4.9.2 - build 4352-gec723a3da',
-  'build_version' => '4352',
+  'app_version' => 'v5.0.0-beta-3',
+  'full_app_version' => 'v5.0.0-beta-3 - build 4352-gec723a3da',
+  'build_version' => '4190',
  'prerelease_version' => '',
  'hash_version' => 'gec723a3da',
-  'full_hash' => 'v4.9.2-9-gec723a3da',
-  'branch' => 'master',
-);
+  'full_hash' => 'v5.0.0-beta-3-gec723a3da',
+  'branch' => 'develop',
+);