ansible/xoxys.mosquitto
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix variables

Browse Source
This commit is contained in:
Robert Kaussow 2018-11-07 23:19:00 +01:00
parent c298b50ca5
commit 160aba61c1
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defaults/main.yml
View File

@ -49,12 +49,12 @@ mosquitto_tls_ciphers:
mosquitto_ca_path: /etc/pki/tls/certs/ mosquitto_ca_path: /etc/pki/tls/certs/
# You can deploy your certificates from a file or from content. # You can deploy your certificates from a file or from content.
# If you enable mosquitto_tls_source_use_content you have to put the content of your cert files into # If you enable mosquitto_tls_source_use_content you have to put the content of your cert files into
# mosquitto_tls_cert_file and mosquitto_tls_cert_file. # mosquitto_tls_cert_path and mosquitto_tls_cert_path.
mosquitto_tls_source_use_content: False mosquitto_tls_source_use_content: False
# If you enable mosquitto_tls_source_use_files theses variables have to contain the path to your # If you enable mosquitto_tls_source_use_files theses variables have to contain the path to your
# certificate files located on the ansible "master" host # certificate files located on the ansible "master" host
mosquitto_tls_source_use_files: True mosquitto_tls_source_use_files: True
mosquitto_tls_cert_source: mycert.pem mosquitto_tls_cert_source: mycert.pem
mosquitto_tls_key_source: mykey.pem mosquitto_tls_key_source: mykey.pem
mosquitto_tls_cert_file: "{{ mosquitto_base_dir }}/tls/certs/mycert.pem" mosquitto_tls_cert_path: "{{ mosquitto_base_dir }}/tls/certs/mycert.pem"
mosquitto_tls_key_file: "{{ mosquitto_base_dir }}/tls/private/mykey.pem" mosquitto_tls_key_path: "{{ mosquitto_base_dir }}/tls/private/mykey.pem"

2
tasks/tls.yml
View File

@ -24,7 +24,6 @@
- { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' }
loop_control: loop_control:
label: "{{ item.dest }}" label: "{{ item.dest }}"
register: __mosquitto_certs_file
when: mosquitto_tls_source_use_files when: mosquitto_tls_source_use_files
- name: Copy certs and private key (content) - name: Copy certs and private key (content)
@ -37,7 +36,6 @@
- { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' } - { src: "{{ mosquitto_tls_cert_source }}", dest: '{{ mosquitto_tls_cert_path }}', mode: '0750' }
loop_control: loop_control:
label: "{{ item.dest }}" label: "{{ item.dest }}"
register: __mosquitto_certs_content
when: mosquitto_tls_source_use_content when: mosquitto_tls_source_use_content
become: True become: True
become_user: "{{ mosquitto_user }}" become_user: "{{ mosquitto_user }}"

4
templates/etc/mosquitto/mosquitto.conf.j2
View File

@ -209,10 +209,10 @@ port {{ mosquitto_port }}
capath {{ mosquitto_ca_path }} capath {{ mosquitto_ca_path }}
# Path to the PEM encoded server certificate. # Path to the PEM encoded server certificate.
certfile {{ mosquitto_tls_cert_file }} certfile {{ mosquitto_tls_cert_path }}
# Path to the PEM encoded keyfile. # Path to the PEM encoded keyfile.
keyfile {{ mosquitto_tls_key_file }} keyfile {{ mosquitto_tls_key_path }}
# This option defines the version of the TLS protocol to use for this listener. # This option defines the version of the TLS protocol to use for this listener.
# The default value allows v1.2, v1.1 and v1.0. The valid values are tlsv1.2 # The default value allows v1.2, v1.1 and v1.0. The valid values are tlsv1.2