Cleanup comments in rabbitmq.config
diff --git a/rabbitmq/files/rabbitmq.config b/rabbitmq/files/rabbitmq.config
index c5e268a..5b0f74c 100644
--- a/rabbitmq/files/rabbitmq.config
+++ b/rabbitmq/files/rabbitmq.config
@@ -1,26 +1,8 @@
{%- from "rabbitmq/map.jinja" import server with context -%}
[
- {#
- {kernel,
- [{inet_dist_listen_min, 65535},
- {inet_dist_listen_max, 65535},
- {inet_default_listen_options, [{nodelay, true},
- {sndbuf, 65535},
- {recbuf, 65535},
- {keepalive, true}
- ]
- },
- {inet_default_connect_options, [{nodelay, true},
- {keepalive, true}
- ]
- }
- ]
- },#}{#
- {mnesia, [{dump_log_write_threshold, 1000}]}, #}
{rabbit, [{vm_memory_high_watermark, {{ server.memory.vm_high_watermark }}},
{memory_alarms, true},
- {disk_free_limit, 50000000},
-{#- {disk_free_limit, {#{mem_relative, 1.0}}, #}
+ {disk_free_limit, {{ server.disk_free_limit }}},
{%- if pillar.rabbitmq.cluster is defined %}
{%- from "rabbitmq/map.jinja" import cluster with context %}
{cluster_partition_handling, autoheal},
diff --git a/rabbitmq/map.jinja b/rabbitmq/map.jinja
index e55224d..051f2fd 100644
--- a/rabbitmq/map.jinja
+++ b/rabbitmq/map.jinja
@@ -6,6 +6,7 @@
'config_file': '/etc/rabbitmq/rabbitmq.config',
'cookie_file': '/var/lib/rabbitmq/.erlang.cookie',
'ulimit': 8192,
+ 'disk_free_limit': 50000000,
'bind': {
'address': '0.0.0.0',
'port': '5672'
@@ -18,6 +19,7 @@
'cookie_file': '/var/lib/rabbitmq/.erlang.cookie',
'default_file': '/etc/default/rabbitmq-server',
'ulimit': 8192,
+ 'disk_free_limit': 50000000,
'bind': {
'address': '0.0.0.0',
'port': '5672'
@@ -29,6 +31,7 @@
'config_file': '/etc/rabbitmq/rabbitmq.config',
'cookie_file': '/var/lib/rabbitmq/.erlang.cookie',
'ulimit': 8192,
+ 'disk_free_limit': 50000000,
'bind': {
'address': '0.0.0.0',
'port': '5672'