Merge "Additional RabbitMQ SSL fixes"

playbooks/roles/rabbitmq_server/tasks/rabbitmq_ssl_key_create.yml

@@ -35,3 +35,14 @@
     creates={{ rabbitmq_ssl_cert }}
   tags:
     - rabbitmq-ssl
+
+- name: Ensure rabbitmq user owns the self-signed key and certificate
+  file:
+    path: "{{ item }}"
+    owner: rabbitmq
+    group: rabbitmq
+  with_items:
+    - "{{ rabbitmq_ssl_key }}"
+    - "{{ rabbitmq_ssl_cert }}"
+  tags:
+    - rabbitmq-ssl

playbooks/roles/rabbitmq_server/tasks/rabbitmq_ssl_key_distribute.yml

@@ -31,3 +31,14 @@
   delay: 2
   tags:
     - rabbitmq-ssl
+
+- name: Ensure rabbitmq user owns the self-signed key and certificate
+  file:
+    path: "{{ item }}"
+    owner: rabbitmq
+    group: rabbitmq
+  with_items:
+    - "{{ rabbitmq_ssl_key }}"
+    - "{{ rabbitmq_ssl_cert }}"
+  tags:
+    - rabbitmq-ssl

playbooks/roles/rabbitmq_server/templates/rabbitmq.config.j2

@@ -4,7 +4,7 @@
     {ssl_listeners, [5671]},
     {ssl_options, [{certfile,"{{ rabbitmq_ssl_cert }}"},
                    {keyfile,"{{ rabbitmq_ssl_key }}"},
-                   {% if rabbitmq_ssl_ca_cert is defined -%}
+                   {% if rabbitmq_user_ssl_ca_cert is defined -%}
                    {cacertfile,"{{ rabbitmq_ssl_ca_cert }}"},
                    {% endif -%}
                    {versions, ['tlsv1.2', 'tlsv1.1']},