From 2ece861419fb49ef15848840d507155760af2f7a Mon Sep 17 00:00:00 2001 From: Arnoud de Jonge Date: Thu, 27 Nov 2014 16:23:31 +0100 Subject: [PATCH] Installation of the rabbitmqadmin script fails when SSL is enabled. This is fixed by using ::ssl_management_port when SSL is enabled. Conflicts: manifests/install/rabbitmqadmin.pp --- manifests/install/rabbitmqadmin.pp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/manifests/install/rabbitmqadmin.pp b/manifests/install/rabbitmqadmin.pp index df5f7b005..a6fad6fd3 100644 --- a/manifests/install/rabbitmqadmin.pp +++ b/manifests/install/rabbitmqadmin.pp @@ -1,7 +1,13 @@ # class rabbitmq::install::rabbitmqadmin { - $management_port = $rabbitmq::management_port + if($rabbitmq::ssl) { + $management_port = $rabbitmq::ssl_management_port + } + else { + $management_port = $rabbitmq::management_port + } + $default_user = $rabbitmq::default_user $default_pass = $rabbitmq::default_pass $protocol = $rabbitmq::ssl ? { false => 'http', default => 'https' } @@ -9,7 +15,7 @@ staging::file { 'rabbitmqadmin': target => '/var/lib/rabbitmq/rabbitmqadmin', source => "${protocol}://${default_user}:${default_pass}@localhost:${management_port}/cli/rabbitmqadmin", - curl_option => '--noproxy localhost', + curl_option => '-k --noproxy localhost', wget_option => '--no-proxy', require => [ Class['rabbitmq::service'],