Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

Fix/aa minor fixes after lando update #328

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix/aa minor fixes after lando update #328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d4e7be
fix indentation
Mar 27, 2019
b89b31a
fix getting database settings from lando info env (lando_info is a li…
Mar 27, 2019
703f7cd
Merge branch 'master' into fix/aa_minor_fixes_after_lando_update
Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions drupal/web/sites/default/settings.lando.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,35 @@
* Load database credentials from Lando app environment.
*/
$lando_info = json_decode(getenv('LANDO_INFO'), TRUE);
$databases['default']['default'] = [
'driver' => 'mysql',
'database' => $lando_info['database']['creds']['database'],
'username' => $lando_info['database']['creds']['user'],
'password' => $lando_info['database']['creds']['password'],
'host' => $lando_info['database']['internal_connection']['host'],
'port' => $lando_info['database']['internal_connection']['port'],
];

if ($lando_info) {
$service_info_from_lando_env = function ($service) use ($lando_info) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of defining this as a function? This makes it very difficult to understand what this code does and why it is there.

foreach ($lando_info as $service_info) {
if (isset($service_info['service']) && $service_info['service'] === $service) {
return $service_info;
}
}

return NULL;
};

$db_info = $service_info_from_lando_env('database');

if ($db_info && isset($db_info['creds']) && isset($db_info['internal_connection'])) {
$databases['default']['default'] = [
'driver' => 'mysql',
'database' => $db_info['creds']['database'],
'username' => $db_info['creds']['user'],
'password' => $db_info['creds']['password'],
'host' => $db_info['internal_connection']['host'],
'port' => $db_info['internal_connection']['port'],
];
}
}


// Use the hash_salt setting from Lando.
$settings['hash_salt'] = getenv('HASH_SALT');
$settings['hash_salt'] = getenv('HASH_SALT') ? getenv('HASH_SALT') : 'random_hash_salt';

// Skip file system permissions hardening when using local development with Lando.
$settings['skip_permissions_hardening'] = TRUE;
Expand Down