From f860cfb96e5b1b365667a72a3ca9517e796c23c7 Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Tue, 21 May 2024 10:16:27 +1000 Subject: [PATCH 1/2] [SDPSUP-7185] Update search endpoints to use https --- images/php/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/php/settings.php b/images/php/settings.php index a36ba07a..daa0410b 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -319,7 +319,7 @@ // Configure elasticsearch connections from environment variables. if (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) { - $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = sprintf('http://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')); + $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = sprintf('https://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')); } else { $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = "http://elasticsearch:9200"; } From 4d45121abe4e8af68b2787931e3bcdb0dc378c4b Mon Sep 17 00:00:00 2001 From: Guy Owen Date: Tue, 21 May 2024 12:07:47 +1000 Subject: [PATCH 2/2] [SDPSUP-7185] Update search endpoints to use http for intra-cluster comms --- images/php/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/php/settings.php b/images/php/settings.php index daa0410b..c95a5ff0 100755 --- a/images/php/settings.php +++ b/images/php/settings.php @@ -319,7 +319,7 @@ // Configure elasticsearch connections from environment variables. if (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) { - $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = sprintf('https://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')); + $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = sprintf('http://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')); } else { $config['elasticsearch_connector.cluster.elasticsearch_bay']['url'] = "http://elasticsearch:9200"; } @@ -347,7 +347,7 @@ } // Override data_pipelines url. -$config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) ? sprintf('https://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')) : "http://elasticsearch:9200"; +$config['data_pipelines.dataset_destination.sdp_elasticsearch']['destinationSettings']['url'] = (getenv('SEARCH_HASH') && getenv('SEARCH_URL')) ? sprintf('http://%s.%s', getenv('SEARCH_HASH'), getenv('SEARCH_URL')) : "http://elasticsearch:9200"; // Configure tide_logs. if (getenv('TIDE_LOGS_UDPLOG_HOST')) {