FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-add pulling the values from the env if not overridden #156

Browse Source
This commit is contained in:
Nabeel Shahzad 2018-01-29 14:48:11 -06:00
parent 9f92f45293
commit 5e6e4bdf4d
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/app.php
View File

@ -8,18 +8,18 @@
*/
return [
'name' => 'phpVMS',
'env' => 'dev',
'debug' => true,
'url' => 'http://localhost',
'name' => env('PHPVMS_VA_NAME', 'phpvms'),
'env' => env('APP_ENV', 'dev'),
'debug' => env('APP_DEBUG', true),
'url' => env('APP_URL', 'http://localhost'),
'version' => '7.0.0',
'locale' => 'en',
'locale' => env('APP_LOCALE', 'en'),
'fallback_locale' => 'en',
'log' => 'daily',
'log_level' => 'debug',
'log_max_files' => 7,
'log' => env('APP_LOG', 'daily'),
'log_level' => env('APP_LOG_LEVEL', 'debug'),
'log_max_files' => env('APP_LOG_MAX_FILES', 5),
# This sends install and vaCentral specific information to help with
# optimizations and figuring out where slowdowns might be happening

24
config/database.php
View File

@ -2,24 +2,24 @@
return [
'fetch' => PDO::FETCH_ASSOC,
'default' => 'mysql',
'default' => env('DB_CONNECTION', 'mysql'),
'connections' => [
'mysql' => [
'driver' => 'mysql',
'host' => '127.0.0.1',
'port' => 3306,
'database' => '',
'username' => '',
'password' => '',
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', 3306),
'database' => env('DB_DATABASE', ''),
'username' => env('DB_USERNAME', ''),
'password' => env('DB_PASSWORD', ''),
//'unix_socket' => env('DB_SOCKET', ''),
'prefix' => '',
'prefix' => env('DB_PREFIX', ''),
'timezone' => '+00:00',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'strict' => false,
'engine' => null,
'options' => [
PDO::ATTR_EMULATE_PREPARES => false,
PDO::ATTR_EMULATE_PREPARES => env('DB_EMULATE_PREPARES', false),
#PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
],
],
@ -48,10 +48,10 @@ return [
'redis' => [
'cluster' => false,
'default' => [
'host' => 'localhost',
'password' => null,
'port' => 6379,
'database' => 1,
'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => env('REDIS_DATABASE', 1),
],
]
];