Skip to content

Commit

Permalink
Installation of the rabbitmqadmin script fails when SSL is enabled. T…
Browse files Browse the repository at this point in the history
…his is fixed by using ::ssl_management_port when SSL is enabled.

Conflicts:
	manifests/install/rabbitmqadmin.pp
  • Loading branch information
Arnoud de Jonge authored and Colleen Murphy committed Dec 17, 2014
1 parent 325de42 commit 2ece861
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions manifests/install/rabbitmqadmin.pp
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
#
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' }

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'],
Expand Down

0 comments on commit 2ece861

Please sign in to comment.