From 24fd482fd4b2d13c9da03dfdf3cd2e588dfcc659 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Thu, 10 Jan 2019 23:49:04 +0100 Subject: [PATCH] fix formatting issues --- defaults/main.yml | 1 - meta/main.yml | 7 +++--- tasks/tls.yml | 64 +++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 0e9b6cf..56f4e7c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -36,7 +36,6 @@ mosquitto_acl_file: "{{ mosquitto_base_dir }}/aclfile" # acl_topic: my/devices # acl_policy: readwrite - mosquitto_tls_enabled: False mosquitto_tls_ciphers: - DEFAULT diff --git a/meta/main.yml b/meta/main.yml index da80340..d9eddfe 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,3 +1,4 @@ +# Standards: 0.1 --- galaxy_info: author: xoxys @@ -5,9 +6,9 @@ galaxy_info: license: MIT min_ansible_version: 2.4 platforms: - - name: EL - versions: - - 7 + - name: EL + versions: + - 7 galaxy_tags: - mosquitto - mqtt diff --git a/tasks/tls.yml b/tasks/tls.yml index 821ccc2..5aff4c5 100644 --- a/tasks/tls.yml +++ b/tasks/tls.yml @@ -1,38 +1,38 @@ --- - block: - - name: Create tls folder structure - file: - path: "{{ item }}" - state: directory - owner: root - group: root - recurse: True - with_items: - - "{{ mosquitto_tls_cert_path | dirname }}" - - "{{ mosquitto_tls_key_path | dirname }}" + - name: Create tls folder structure + file: + path: "{{ item }}" + state: directory + owner: root + group: root + recurse: True + with_items: + - "{{ mosquitto_tls_cert_path | dirname }}" + - "{{ mosquitto_tls_key_path | dirname }}" - - name: Copy certs and private key (file) - copy: - src: "{{ item.src }}" - dest: "{{ item.dest }}" - mode: "{{ item.mode }}" - with_items: - - { src: "{{ mosquitto_tls_key_source }}", dest: '{{ mosquitto_tls_key_path }}', mode: '0600' } - - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } - loop_control: - label: "{{ item.dest }}" - when: mosquitto_tls_source_use_files + - name: Copy certs and private key (file) + copy: + src: "{{ item.src }}" + dest: "{{ item.dest }}" + mode: "{{ item.mode }}" + with_items: + - { src: "{{ mosquitto_tls_key_source }}", dest: '{{ mosquitto_tls_key_path }}', mode: '0600' } + - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } + loop_control: + label: "{{ item.dest }}" + when: mosquitto_tls_source_use_files - - name: Copy certs and private key (content) - copy: - content: "{{ item.src }}" - dest: "{{ item.dest }}" - mode: "{{ item.mode }}" - with_items: - - { src: "{{ mosquitto_tls_key_source }}", dest: '{{ mosquitto_tls_key_path }}', mode: '0600' } - - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } - loop_control: - label: "{{ item.dest }}" - when: mosquitto_tls_source_use_content + - name: Copy certs and private key (content) + copy: + content: "{{ item.src }}" + dest: "{{ item.dest }}" + mode: "{{ item.mode }}" + with_items: + - { src: "{{ mosquitto_tls_key_source }}", dest: '{{ mosquitto_tls_key_path }}', mode: '0600' } + - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } + loop_control: + label: "{{ item.dest }}" + when: mosquitto_tls_source_use_content become: True become_user: root