[MediaWiki-commits] [Gerrit] Use https to talk to elasticsearch in beta cluster - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Use https to talk to elasticsearch in beta cluster .. Use https to talk to elasticsearch in beta cluster Bug: T12 Change-Id: I0e356fb893556a7ebbf650d98832697bed3720d6 --- M wmf-config/CirrusSearch-labs.php M wmf-config/LabsServices.php 2 files changed, 16 insertions(+), 5 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index a876768..d1b5e73 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -6,7 +6,17 @@ # It should be loaded AFTER CirrusSearch-common.php $wgCirrusSearchClusters = array( - 'eqiad' => $wmfAllServices['eqiad']['search'] + 'eqiad' => array_map( function ( $host ) { + return array( + 'transport' => 'Https', + 'port' => '9243', + 'host' => $host, + 'curl' => array( + // We might not need to specify the cert explicitly, + // CURLOPT_CAINFO => '/etc/ssl/certs/wmf-labs.pem', + ), + ); + }, $wmfAllServices['eqiad']['search'] ), ); if ( $wgDBname == 'enwiki' ) { diff --git a/wmf-config/LabsServices.php b/wmf-config/LabsServices.php index 6bf5e0e..ee3f943 100644 --- a/wmf-config/LabsServices.php +++ b/wmf-config/LabsServices.php @@ -15,10 +15,11 @@ 'udp2log' => 'deployment-fluorine.eqiad.wmflabs:8420', 'statsd' => 'labmon1001.eqiad.wmnet', 'search' => array( - 'deployment-elastic05', - 'deployment-elastic06', - 'deployment-elastic07', - 'deployment-elastic08', + // These MUST match the installed SSL certs + 'deployment-elastic05.deployment-prep.eqiad.wmflabs', + 'deployment-elastic06.deployment-prep.eqiad.wmflabs', + 'deployment-elastic07.deployment-prep.eqiad.wmflabs', + 'deployment-elastic08.deployment-prep.eqiad.wmflabs', ), 'ocg' => 'http://deployment-pdf01:8000', 'urldownloader' => 'http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080', -- To view, visit https://gerrit.wikimedia.org/r/274877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e356fb893556a7ebbf650d98832697bed3720d6 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardsonGerrit-Reviewer: EBernhardson Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https to talk to elasticsearch in beta cluster - change (operations/mediawiki-config)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/274877 Change subject: Use https to talk to elasticsearch in beta cluster .. Use https to talk to elasticsearch in beta cluster Bug: T12 Change-Id: I0e356fb893556a7ebbf650d98832697bed3720d6 --- M wmf-config/CirrusSearch-labs.php M wmf-config/LabsServices.php 2 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/77/274877/1 diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php index a876768..d1b5e73 100644 --- a/wmf-config/CirrusSearch-labs.php +++ b/wmf-config/CirrusSearch-labs.php @@ -6,7 +6,17 @@ # It should be loaded AFTER CirrusSearch-common.php $wgCirrusSearchClusters = array( - 'eqiad' => $wmfAllServices['eqiad']['search'] + 'eqiad' => array_map( function ( $host ) { + return array( + 'transport' => 'Https', + 'port' => '9243', + 'host' => $host, + 'curl' => array( + // We might not need to specify the cert explicitly, + // CURLOPT_CAINFO => '/etc/ssl/certs/wmf-labs.pem', + ), + ); + }, $wmfAllServices['eqiad']['search'] ), ); if ( $wgDBname == 'enwiki' ) { diff --git a/wmf-config/LabsServices.php b/wmf-config/LabsServices.php index 6bf5e0e..ee3f943 100644 --- a/wmf-config/LabsServices.php +++ b/wmf-config/LabsServices.php @@ -15,10 +15,11 @@ 'udp2log' => 'deployment-fluorine.eqiad.wmflabs:8420', 'statsd' => 'labmon1001.eqiad.wmnet', 'search' => array( - 'deployment-elastic05', - 'deployment-elastic06', - 'deployment-elastic07', - 'deployment-elastic08', + // These MUST match the installed SSL certs + 'deployment-elastic05.deployment-prep.eqiad.wmflabs', + 'deployment-elastic06.deployment-prep.eqiad.wmflabs', + 'deployment-elastic07.deployment-prep.eqiad.wmflabs', + 'deployment-elastic08.deployment-prep.eqiad.wmflabs', ), 'ocg' => 'http://deployment-pdf01:8000', 'urldownloader' => 'http://deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080', -- To view, visit https://gerrit.wikimedia.org/r/274877 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e356fb893556a7ebbf650d98832697bed3720d6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits