From 0f919be9dac465347375781391770e766e87b582 Mon Sep 17 00:00:00 2001 From: Frank Wisniewski Date: Fri, 10 Oct 2014 17:27:10 +0200 Subject: [PATCH] Adding switch to make TCP listeners optional Re-implementing tcp listener pull request by ziuchkovski (https://github.com/kennonkwok/rabbitmq/pull/89/) --- attributes/default.rb | 1 + templates/default/rabbitmq.config.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/attributes/default.rb b/attributes/default.rb index 32af518d..74f5f9ee 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -58,6 +58,7 @@ default['rabbitmq']['web_console_ssl_port'] = 15_671 # tcp listen options +default['rabbitmq']['tcp_listen'] = true default['rabbitmq']['tcp_listen_packet'] = 'raw' default['rabbitmq']['tcp_listen_reuseaddr'] = true default['rabbitmq']['tcp_listen_backlog'] = 128 diff --git a/templates/default/rabbitmq.config.erb b/templates/default/rabbitmq.config.erb index 09cdc86a..d50b8f18 100644 --- a/templates/default/rabbitmq.config.erb +++ b/templates/default/rabbitmq.config.erb @@ -29,12 +29,16 @@ {verify,<%= node['rabbitmq']['ssl_verify'] %>}, {fail_if_no_peer_cert,<%= node['rabbitmq']['ssl_fail_if_no_peer_cert'] %>}]}, <% end %> +<% if node['rabbitmq']['tcp_listen'] -%> {tcp_listen_options, [binary, {packet,<%= node['rabbitmq']['tcp_listen_packet'] %>}, {reuseaddr,<%= node['rabbitmq']['tcp_listen_reuseaddr'] %>}, {backlog,<%= node['rabbitmq']['tcp_listen_backlog'] %>}, {nodelay,<%= node['rabbitmq']['tcp_listen_nodelay'] %>}, {exit_on_close,<%= node['rabbitmq']['tcp_listen_exit_on_close'] %>}, {keepalive,<%= node['rabbitmq']['tcp_listen_keepalive'] %>}]}, +<% else -%> + {tcp_listeners, []}, +<% end %> <% if node['rabbitmq']['disk_free_limit_relative'] -%> {disk_free_limit, {mem_relative, <%= node['rabbitmq']['disk_free_limit_relative'] %>}}, <% end %>