read in a local.conf.php in the root for overrides
This commit is contained in:
@@ -4,7 +4,6 @@ namespace App\Providers;
|
|||||||
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
use App\Services\AircraftService;
|
|
||||||
|
|
||||||
class AppServiceProvider extends ServiceProvider
|
class AppServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
@@ -15,7 +14,15 @@ class AppServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
//
|
# if there's a local.conf.php in the root, then merge that in
|
||||||
|
if(file_exists(base_path('local.conf.php'))) {
|
||||||
|
$local_conf = include(base_path('local.conf.php'));
|
||||||
|
$config = $this->app['config']->get('phpvms', []);
|
||||||
|
$this->app['config']->set(
|
||||||
|
'phpvms',
|
||||||
|
array_merge($config, $local_conf)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
+4
-1
@@ -4,7 +4,9 @@ return [
|
|||||||
|
|
||||||
'status' => [
|
'status' => [
|
||||||
'INACTIVE' => 0,
|
'INACTIVE' => 0,
|
||||||
'ACTIVE' => 1,
|
'DISABLED' => 0,
|
||||||
|
'ACTIVE' => 1,
|
||||||
|
'ENABLED' => 1,
|
||||||
],
|
],
|
||||||
|
|
||||||
'sources' => [
|
'sources' => [
|
||||||
@@ -23,5 +25,6 @@ return [
|
|||||||
'JETA' => 1,
|
'JETA' => 1,
|
||||||
'MOGAS' => 2,
|
'MOGAS' => 2,
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
+10
-2
@@ -1,11 +1,19 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* DO NOT MODIFY THIS FILE DIRECTLY!
|
||||||
|
* It will just make upgrading (a little) more difficult
|
||||||
|
*
|
||||||
|
* Create a local.conf.php in the root (in the same directory
|
||||||
|
* as your .env file), and then copy this file into there, and
|
||||||
|
* make your changes there.
|
||||||
|
*/
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Pick one of:
|
* Pick one of:
|
||||||
* dollar, euro, gbp, yen, jpy, rupee, ruble
|
* dollar, euro, gbp, yen, jpy, rupee, ruble
|
||||||
*/
|
*/
|
||||||
'currency' => env('PHPVMS_CURRENCY', 'dollar'),
|
'currency' => 'dollar',
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
Reference in New Issue
Block a user