aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-12-10 17:12:03 +0100
committerGitHub <noreply@github.com>2019-12-10 17:12:03 +0100
commitb8d2859a9fece15dac2b9260d71dea39f8ce19b3 (patch)
tree151baf77657da99eb16a795b6c14727e2a1ce47f
parent8e4ce5e3f34f7a398f678a0cf64b70289269813b (diff)
parentd93c400415813e4ea4d8e05ef79888ce9809a60a (diff)
Merge pull request #11526 from vespa-engine/bjorncs/vespa-deploy
Disable hostname verification for curl in vespa-deploy
-rwxr-xr-xconfig-model/src/main/perl/vespa-deploy3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy
index fede8b994c1..3519d5ace58 100755
--- a/config-model/src/main/perl/vespa-deploy
+++ b/config-model/src/main/perl/vespa-deploy
@@ -153,7 +153,8 @@ $session_id_file = "$cloudconfig_dir/$tenant/deploy-session-id";
my $command = shift;
$command ||= "help";
-my $curl_command = $VESPA_HOME . '/libexec/vespa/vespa-curl-wrapper -A vespa-deploy --silent --show-error --connect-timeout 30 --max-time 1200';
+# The '--insecure' parameter is sadly required as it is not possible to disable or alter hostname verification with curl
+my $curl_command = $VESPA_HOME . '/libexec/vespa/vespa-curl-wrapper --insecure -A vespa-deploy --silent --show-error --connect-timeout 30 --max-time 1200';
my $CURL_PUT = $curl_command . ' --write-out \%{http_code} --request PUT';
my $CURL_GET = $curl_command . ' --request GET';