From aa3295aa14400dbac628019de5a75a2ce2defc99 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 18 Dec 2017 11:44:17 +0100 Subject: [PATCH] add require_certificate --- defaults/main.yml | 8 +++++--- templates/etc/mosquitto/conf.d/default.conf.j2 | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 64b01f1..1908850 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,11 +5,13 @@ mosquitto_bind_address: "{{ ansible_default_ipv4.address }}" mosquitto_pid_dir: /var/run mosquitto_base_dir: /etc/mosquitto mosquitto_config_dir: "{{ mosquitto_base_dir }}/conf.d" +mosquitto_passwd_file: "{{ mosquitto_base_dir }}/passwd" +mosquitto_pid_file: "{{ mosquitto_pid_dir }}/mosquitto.pid" + +mosquitto_tls_enabled: False +mosquitto_require_certificate: False mosquitto_ca_dir: "{{ mosquitto_base_dir }}/ca_certificates" mosquitto_certs_dir: "{{ mosquitto_base_dir }}/certs" mosquitto_ca_file: "{{ mosquitto_ca_dir }}/ca.pem" mosquitto_private_key_file: "{{ mosquitto_certs_dir }}/mttq.key" mosquitto_cert_file: "{{ mosquitto_certs_dir }}/mttq.pem" -mosquitto_passwd_file: "{{ mosquitto_base_dir }}/passwd" -mosquitto_pid_file: "{{ mosquitto_pid_dir }}/mosquitto.pid" -mosquitto_tls_enabled: False diff --git a/templates/etc/mosquitto/conf.d/default.conf.j2 b/templates/etc/mosquitto/conf.d/default.conf.j2 index 59908de..ef7ccdb 100644 --- a/templates/etc/mosquitto/conf.d/default.conf.j2 +++ b/templates/etc/mosquitto/conf.d/default.conf.j2 @@ -23,5 +23,5 @@ password_file {{ mosquitto_passwd_file }} cafile {{ mosquitto_ca_file }} certfile {{ mosquitto_cert_file }} keyfile {{ mosquitto_private_key_file }} -require_certificate true +require_certificate {{ mosquitto_require_certificate|lower }} {% endif %}