Skip to content

Commit

Permalink
Merge pull request #775 from afoucret/fix-envfile-handling
Browse files Browse the repository at this point in the history
Fix reading es config from the env file is set.
  • Loading branch information
afoucret authored Feb 21, 2018
2 parents c37461e + 25d5efa commit ff0cc6f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/module-elasticsuite-core/Setup/ConfigOptionsList.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private function getClientOptions(array $options, DeploymentConfig $deploymentCo
{
$clientOptions = [];

if (isset($options[self::INPUT_KEY_ES_HOSTS])) {
if (isset($options[self::INPUT_KEY_ES_HOSTS]) || $deploymentConfig->get(self::CONFIG_PATH_ES_HOSTS)) {
$clientOptions = [
'servers' => $this->readConfiguration($options, $deploymentConfig, self::INPUT_KEY_ES_HOSTS),
'enable_https_mode' => $this->readConfiguration($options, $deploymentConfig, self::INPUT_KEY_ES_SSL),
Expand Down

0 comments on commit ff0cc6f

Please sign in to comment.