From 2c2021f6b67b18cf264e5db823258151fa232b93 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sat, 23 Jan 2021 01:23:20 -0700 Subject: [PATCH] fixes --- tasks/main.yml | 4 ++-- tasks/users.yml | 4 ++-- templates/etc/rabbitmq/rabbitmq.conf.j2 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index b9b06f1..53a3a19 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,7 +8,7 @@ - name: Deploy RabbitMQ configuration template: src: "etc/rabbitmq/{{ item }}.j2" - dest: "etc/rabbitmq/{{ item }}" + dest: "/etc/rabbitmq/{{ item }}" owner: rabbitmq group: rabbitmq mode: '0644' @@ -42,7 +42,7 @@ mode: '0644' content: | [Service] - LimitNOFILE={{ rabbitmq_cluster_file_limit }} + LimitNOFILE={{ rabbitmq_file_limit }} - name: Enable RabbitMQ Plugins community.rabbitmq.rabbitmq_plugin: diff --git a/tasks/users.yml b/tasks/users.yml index e4365bd..f02e724 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -17,7 +17,7 @@ read_priv: ".*" write_priv: ".*" tags: administrator - when: inventory_hostname.startswith('rabbitmq01') + when: "'rabbitmq001' in inventory_hostname" with_items: - / - /pubsub @@ -56,6 +56,6 @@ write_priv: "^$" tags: monitoring when: - - inventory_hostname.startswith('rabbitmq01') + - "'rabbitmq001' in inventory_hostname" - rabbitmq_monitoring_username - rabbitmq_monitoring_password diff --git a/templates/etc/rabbitmq/rabbitmq.conf.j2 b/templates/etc/rabbitmq/rabbitmq.conf.j2 index 9b047cc..1b8648b 100644 --- a/templates/etc/rabbitmq/rabbitmq.conf.j2 +++ b/templates/etc/rabbitmq/rabbitmq.conf.j2 @@ -6,9 +6,9 @@ num_acceptors.ssl = 10 reverse_dns_lookups = true -rabbitmq_tls_ca_cert: "/etc/pki/tls/certs/ca-bundle.crt" -rabbitmq_tls_cert: "/etc/pki/tls/certs/{{ ansible_fqdn }}.crt" -rabbitmq_tls_key: "/etc/pki/tls/private/{{ ansible_fqdn }}.key" +rabbitmq_tls_ca_cert = "/etc/pki/tls/certs/ca-bundle.crt" +rabbitmq_tls_cert = "/etc/pki/tls/certs/{{ ansible_fqdn }}.crt" +rabbitmq_tls_key = "/etc/pki/tls/private/{{ ansible_fqdn }}.key" ssl_options.verify = verify_peer ssl_options.fail_if_no_peer_cert = false