Merge pull request #5 from idealista/develop

Develop

Author: José Noguera

CHANGELOG.md

@@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/fluentd-role/tree/develop)
 
+## [1.1.0](https://github.com/idealista/fluentd-role/tree/1.1.0)
+## [Full Changelog](https://github.com/idealista/fluentd-role/compare/1.0.0...1.1.0)
+### Changed
+- *[#2](https://github.com/idealista/fluentd-role/issues/2) Templating fluent config file* @jnogol
+- *Using templates/fluentd folder instead of templates* @jnogol
+- *Fluentd config template path depends on a variable* @jnogol
+
 ## [1.0.0](https://github.com/idealista/fluentd-role/tree/1.0.0) (2017-11-08)
 
 ### Added

README.md

@@ -1,4 +1,5 @@
 ![Logo](logo.gif)
+
 [![Build Status](https://travis-ci.org/idealista/fluentd-role.svg?branch=master)](https://travis-ci.org/idealista/fluentd-role)
 # Fluentd Ansible role
 

defaults/main.yml

@@ -1,12 +1,13 @@
 #### installation variables ####
 fluentd_user: fluentd
 fluentd_group: fluentd
-fluentd_conf_file: "{{ playbook_dir }}/files/fluentd/fluent.conf"
 fluentd_conf_path: "/etc/fluent"
 fluentd_log_path: "/var/log/fluent"
 fluentd_log_file: "{{ fluentd_log_path }}/fluent.log"
 fluentd_version: "0.12.40"
 fluentd_plugins: []
 # current state: started, stopped, restarted, reloaded
 fluentd_service_state: started
-fluentd_service_enabled: yes # yes, no
+fluentd_service_enabled: yes # yes, no
+
+fluentd_playbook_templates_path: "{{ playbook_dir }}/templates/fluentd"

tasks/config.yml

@@ -17,16 +17,16 @@
     mode: 0755
 
 - name: FLUENTD | Copy server config
-  copy:
-    src: "{{ fluentd_conf_file }}"
+  template:
+    src: "{{ fluentd_playbook_templates_path }}/fluent.conf.j2"
     dest: "{{ fluentd_conf_path }}/fluent.conf"
     owner: "{{ fluentd_user }}"
     group: "{{ fluentd_group }}"
     mode: 0644
 
 - name: FLUENTD | Copy fluentd service config
   template:
-    src: fluentd.service.j2
+    src: fluentd/fluentd.service.j2
     dest: /lib/systemd/system/fluentd.service
     owner: "{{ fluentd_user }}"
     group: "{{ fluentd_group }}"

templates/fluentd.service.j2 templates/fluentd/fluentd.service.j2templates/fluentd.service.j2 renamed to templates/fluentd/fluentd.service.j2

@@ -1,3 +1,4 @@
+{{ ansible_managed }}
 ###
 # sample file copied from "fluentd --setup" result
 ###