From d59e8cd0be22ebf1152e5b1ac25c8c5cd63a2d93 Mon Sep 17 00:00:00 2001
From: Miguelangel Freitas <miguelangel@wazuh.com>
Date: Thu, 13 Jul 2017 13:24:07 -0400
Subject: [PATCH] Logstash role: split config tasks from main tasks

---
 ansible-role-logstash/tasks/config.yml | 35 ++++++++++++++++++++++++++
 ansible-role-logstash/tasks/main.yml   | 19 ++------------
 2 files changed, 37 insertions(+), 17 deletions(-)
 create mode 100644 ansible-role-logstash/tasks/config.yml

diff --git a/ansible-role-logstash/tasks/config.yml b/ansible-role-logstash/tasks/config.yml
new file mode 100644
index 00000000..1e14661c
--- /dev/null
+++ b/ansible-role-logstash/tasks/config.yml
@@ -0,0 +1,35 @@
+---
+- name: Logstash template
+  template:
+    src: wazuh-elastic5-template.json.j2
+    dest: /etc/logstash/wazuh-elastic5-template.json
+    owner: root
+    group: root
+  tags: configure
+
+- name: Ensure Logstash SSL key pair directory exists.
+  file:
+    path: "{{ logstash_ssl_dir }}"
+    state: directory
+  when: logstash_ssl
+  tags: configure
+
+- name: Copy SSL key and cert for logstash.
+  copy:
+    src: "{{ item }}"
+    dest: "{{ logstash_ssl_dir }}/{{ item | basename }}"
+    mode: 0644
+  with_items:
+    - "{{ logstash_ssl_key_file }}"
+    - "{{ logstash_ssl_certificate_file }}"
+  when: logstash_ssl
+  tags: configure
+
+- name: Logstash configuration
+  template:
+    src: 01-wazuh.conf.j2
+    dest: /etc/logstash/conf.d/01-wazuh.conf
+    owner: root
+    group: root
+  notify: restart logstash
+  tags: configure
diff --git a/ansible-role-logstash/tasks/main.yml b/ansible-role-logstash/tasks/main.yml
index d01ed205..219580a5 100644
--- a/ansible-role-logstash/tasks/main.yml
+++ b/ansible-role-logstash/tasks/main.yml
@@ -5,23 +5,8 @@
 - include: Debian.yml
   when: ansible_os_family == "Debian"
 
-- name: Logstash configuration
-  template:
-    src: 01-wazuh.conf.j2
-    dest: /etc/logstash/conf.d/01-wazuh.conf
-    owner: root
-    group: root
-  notify: restart logstash
-  tags: configure
-
-- name: Logstash template
-  template:
-    src: wazuh-elastic5-template.json.j2
-    dest: /etc/logstash/wazuh-elastic5-template.json
-    owner: root
-    group: root
-  notify: restart logstash
-  tags: configure
+- include: config.yml
+  when: logstash_create_config
 
 - name: Ensure Logstash started and enabled
   service: