Rebased from master after PR's and cleaned up

diff --git a/defaults/main.yml b/defaults/main.yml
index 4771a6b519f7082a20849eb9fa9e70edbff8d9b7..f3d2c20e04f6a4addc1c2224909d39c0eea72e95 100644 (file)
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,15 +1,15 @@
 ---
 # defaults file for ansible-rabbitmq
 rabbitmq_config: []
-  # - queue_name: logstash
-  #   durable: true
-  #   exchange_name: logstash
-  #   type: 'direct'
-  #   routing_key: 'logstash'
-  #   tags: 'ha-mode=all,ha-sync-mode=automatic'
-  # - policy_pattern: '.*'
-  #   vhost: 'apps'
-  #   tags: 'ha-mode=all,ha-sync-mode=automatic'
+# - queue_name: logstash
+#   durable: true
+#   exchange_name: logstash
+#   type: direct
+#   routing_key: logstash
+#   tags: "ha-mode=all,ha-sync-mode=automatic"
+# - policy_pattern: ".*"
+#   vhost: apps
+#   tags: "ha-mode=all,ha-sync-mode=automatic"
 
 # Defines if rabbitmq ha should be configured
 rabbitmq_config_ha: false
@@ -23,7 +23,9 @@ rabbitmq_debian_repo: "deb https://dl.bintray.com/rabbitmq/debian {{ ansible_dis
 # rabbitmq_debian_repo_key: https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
 rabbitmq_debian_repo_key: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq
 rabbitmq_debian_erlang_from_rabbit: false
-rabbitmq_debian_version: 3.7.9 # current version if not defined
+
+# current version if not defined
+rabbitmq_debian_version: 3.7.9
 
 # Defines if setting up a rabbitmq cluster
 rabbitmq_enable_clustering: false
@@ -32,20 +34,21 @@ rabbitmq_erlang_cookie_file: /var/lib/rabbitmq/.erlang.cookie
 
 rabbitmq_listen_port: 5672
 rabbitmq_listeners: []
-  # - 127.0.0.1
-  # - '::1'
+# - 127.0.0.1
+# - '::1'
 
 rabbitmq_ssl_enable: false
 rabbitmq_ssl_port: 5671
 rabbitmq_ssl_listeners: []
-  # - '127.0.0.1'
-  # - '::1'
+# - 127.0.0.1
+# - "::1"
+
 rabitmq_ssl_options: {}
-  # cacertfile: '"/path/to/testca/cacert.pem"'
-  # certfile: '"/path/to/server/cert.pem"'
-  # keyfile: '"/path/to/server/key.pem"'
-  # verify: verify_peer
-  # fail_if_no_peer_cert: "false"
+# cacertfile: '"/path/to/testca/cacert.pem"'
+# certfile: '"/path/to/server/cert.pem"'
+# keyfile: '"/path/to/server/key.pem"'
+# verify: verify_peer
+# fail_if_no_peer_cert: "false"
 
 # Defines the inventory host that should be considered master
 rabbitmq_master: []

diff --git a/tasks/main.yml b/tasks/main.yml
index 3205473463c95f6761ec22338e2b1c6cc5aaa283..1ef08f0a7462c080a2a51ce9571fbd1ed964ebc7 100644 (file)
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 # tasks file for ansible-rabbitmq
 - include: debian.yml
   when: ansible_os_family == "Debian"