// Compute settingsPath.
$siteDir = \Civi\Setup\DrupalUtil::getDrupalSiteDir($cmsPath);
- $model->settingsPath = implode(DIRECTORY_SEPARATOR, [$cmsPath, 'sites', $siteDir, 'civicrm.settings.php']);
+ $model->settingsPath = implode(DIRECTORY_SEPARATOR, [$cmsPath, $siteDir, 'civicrm.settings.php']);
if (($loadGenerated = \Drupal\Core\Site\Settings::get('civicrm_load_generated', NULL)) !== NULL) {
$model->loadGenerated = $loadGenerated;
// Compute DSN.
$connectionOptions = \Drupal::database()->getConnectionOptions();
$ssl_params = \Civi\Setup\DrupalUtil::guessSslParams($connectionOptions);
+ // @todo Does Drupal support unixsocket in config? Set 'server' => 'unix(/path/to/socket.sock)'
$model->db = $model->cmsDb = array(
- 'server' => \Civi\Setup\DbUtil::encodeHostPort($connectionOptions['host'], $connectionOptions['port'] ?: NULL),
+ 'server' => \Civi\Setup\DbUtil::encodeHostPort($connectionOptions['host'], $connectionOptions['port'] ?? NULL),
'username' => $connectionOptions['username'],
'password' => $connectionOptions['password'],
'database' => $connectionOptions['database'],