kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #2231

Browse Source
This commit is contained in:
James Cole
2019-09-07 20:44:02 +02:00
parent 03d8543cae
commit 5fcb5fdaa5
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
config/database.php
View File

@@ -29,11 +29,13 @@ $password = '';
$database = ''; $database = '';
if (!(false === $databaseUrl)) { if (!(false === $databaseUrl)) {
$options = parse_url($databaseUrl); $options = parse_url($databaseUrl);
$host = $options['host']; $host = $options['host'] ?? 'firefly_iii_db';
$username = $options['user']; $username = $options['user'] ?? 'firefly';
$password = $options['pass']; $port = $options['port'] ?? '5432';
$database = substr($options['path'], 1); $password = $options['pass'] ?? 'secret_firefly_password';
$database = substr($options['path'] ?? '/firefly', 1);
} }
return [ return [
@@ -47,11 +49,11 @@ return [
], ],
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'host' => envNonEmpty('DB_HOST', '127.0.0.1'), 'host' => envNonEmpty('DB_HOST', $host),
'port' => envNonEmpty('DB_PORT', '3306'), 'port' => envNonEmpty('DB_PORT', $port),
'database' => envNonEmpty('DB_DATABASE', 'forge'), 'database' => envNonEmpty('DB_DATABASE', $database),
'username' => envNonEmpty('DB_USERNAME', 'forge'), 'username' => envNonEmpty('DB_USERNAME', $username),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', $password),
'unix_socket' => env('DB_SOCKET', ''), 'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4', 'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci', 'collation' => 'utf8mb4_unicode_ci',
@@ -62,7 +64,7 @@ return [
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'host' => envNonEmpty('DB_HOST', $host), 'host' => envNonEmpty('DB_HOST', $host),
'port' => envNonEmpty('DB_PORT', '5432'), 'port' => envNonEmpty('DB_PORT', $port),
'database' => envNonEmpty('DB_DATABASE', $database), 'database' => envNonEmpty('DB_DATABASE', $database),
'username' => envNonEmpty('DB_USERNAME', $username), 'username' => envNonEmpty('DB_USERNAME', $username),
'password' => env('DB_PASSWORD', $password), 'password' => env('DB_PASSWORD', $password),