From 0b371363649c78130b5d704a2d77b2302efb15ea Mon Sep 17 00:00:00 2001 From: kirby Date: Tue, 27 May 2025 09:58:15 +0200 Subject: [PATCH] linting rabbitmq ansible role --- ansible/roles/rabbitmq/defaults/main.yml | 48 ++++++++++++------------ ansible/roles/rabbitmq/tasks/config.yml | 8 ++-- ansible/roles/rabbitmq/tasks/install.yml | 18 ++++----- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index bbf00fc..de6a213 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -7,30 +7,30 @@ rabbitmq_vhosts: "" rabbitmq_plugins: "rabbitmq_management,rabbitmq_shovel,rabbitmq_prometheus,rabbitmq_shovel_management" rabbitmq_collect_statistics_interval: 30000 -#rabbitmq_exchanges: -# - name: "myapp.topic" -# type: "topic" -# vhost: "myapp" +# rabbitmq_exchanges: +# - name: "myapp.topic" +# type: "topic" +# vhost: "myapp" # -#rabbitmq_queues: -# - name: "myapp.queue" -# vhost: "myapp" -# dead_letter_exchange: "" -# dead_letter_routing_key: "myapp.dlq" -# arguments: -# x-queue-type: quorum +# rabbitmq_queues: +# - name: "myapp.queue" +# vhost: "myapp" +# dead_letter_exchange: "" +# dead_letter_routing_key: "myapp.dlq" +# arguments: +# x-queue-type: quorum # -#rabbitmq_bindings: -# - name: "myapp.topic" -# vhost: "myapp" -# destination: "myapp.queue" -# destination_type: "queue" -# routing_key: "*" +# rabbitmq_bindings: +# - name: "myapp.topic" +# vhost: "myapp" +# destination: "myapp.queue" +# destination_type: "queue" +# routing_key: "*" # -#rabbitmq_app_users: -# - username: "myapp" -# password: "{{ lookup('community.hashi_vault.hashi_vault','ansible/data/rabbitmq/{{ env }}/users/myapp:password') }}" -# vhost: "myapp" -# read_priv: "^myapp.*" -# write_priv: "^myapp.*" -# configure_priv: "^$" +# rabbitmq_app_users: +# - username: "myapp" +# password: "{{ lookup('community.hashi_vault.hashi_vault','ansible/data/rabbitmq/{{ env }}/users/myapp:password') }}" +# vhost: "myapp" +# read_priv: "^myapp.*" +# write_priv: "^myapp.*" +# configure_priv: "^$" diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index 53a2927..58aea0b 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -4,7 +4,7 @@ ansible.builtin.template: src: rabbitmq.conf.j2 dest: /etc/rabbitmq/rabbitmq.conf - mode: 0644 + mode: "0644" owner: rabbitmq group: rabbitmq notify: Restart Rabbitmq @@ -14,7 +14,7 @@ ansible.builtin.template: src: rabbitmq-env.conf.j2 dest: /etc/rabbitmq/rabbitmq-env.conf - mode: 0644 + mode: "0644" owner: rabbitmq group: rabbitmq notify: Restart Rabbitmq @@ -79,7 +79,7 @@ community.rabbitmq.rabbitmq_queue: login_user: "{{ rabbitmq_admin_username }}" login_password: "{{ rabbitmq_admin_password }}" - state: "{{ item.state | default('present')}}" + state: "{{ item.state | default('present') }}" vhost: "{{ item.vhost }}" name: "{{ item.name }}" durable: "{{ item.durable | default(true) }}" @@ -93,7 +93,7 @@ community.rabbitmq.rabbitmq_binding: login_user: "{{ rabbitmq_admin_username }}" login_password: "{{ rabbitmq_admin_password }}" - state: "{{ item.state |default('present') }}" + state: "{{ item.state | default('present') }}" vhost: "{{ item.vhost }}" name: "{{ item.name }}" destination: "{{ item.destination }}" diff --git a/ansible/roles/rabbitmq/tasks/install.yml b/ansible/roles/rabbitmq/tasks/install.yml index c250f0b..e07162d 100644 --- a/ansible/roles/rabbitmq/tasks/install.yml +++ b/ansible/roles/rabbitmq/tasks/install.yml @@ -15,7 +15,7 @@ ansible.builtin.get_url: url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key" dest: "/usr/share/keyrings/rabbitmq.9F4587F226208342.asc" - mode: 0644 + mode: "0644" force: true tags: install @@ -23,7 +23,7 @@ ansible.builtin.get_url: url: "https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key" dest: "/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg" - mode: 0644 + mode: "0644" force: true tags: install @@ -31,7 +31,7 @@ ansible.builtin.get_url: url: "https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key" dest: "/usr/share/keyrings/rabbitmq.9F4587F226208342.gpg" - mode: 0644 + mode: "0644" force: true tags: install @@ -95,14 +95,14 @@ state: directory owner: root group: root - mode: 0755 + mode: "0755" tags: install - name: Set LimitNOFILE ansible.builtin.copy: src: limits.conf dest: "/etc/systemd/system/rabbitmq-server.service.d/limits.conf" - mode: 0644 + mode: "0644" owner: root group: root tags: install @@ -116,7 +116,7 @@ dest: /var/lib/rabbitmq/.erlang.cookie owner: rabbitmq group: rabbitmq - mode: 0400 + mode: "0400" tags: install notify: Restart Rabbitmq @@ -130,7 +130,7 @@ ansible.builtin.template: src: rabbitmq.conf.j2 dest: /etc/rabbitmq/rabbitmq.conf - mode: 0644 + mode: "0644" owner: rabbitmq group: rabbitmq notify: Restart Rabbitmq @@ -140,7 +140,7 @@ ansible.builtin.template: src: rabbitmq-env.conf.j2 dest: /etc/rabbitmq/rabbitmq-env.conf - mode: 0644 + mode: "0644" owner: rabbitmq group: rabbitmq notify: Restart Rabbitmq @@ -150,7 +150,7 @@ ansible.builtin.copy: src: logrotate dest: /etc/logrotate.d/rabbitmq-server - mode: 0644 + mode: "0644" user: root group: root tags: install