Merge pull request #19 from idealista/develop

Develop

Author: dortegau

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 
 Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
- including treating everyone with respect: https://github.com/idealista/idealista/blob/master/CODE_OF_CONDUCT.md
+ including treating everyone with respect: https://github.com/idealista/fluentd-role/blob/master/CODE_OF_CONDUCT.md
 
 -->
 

CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/fluentd-role/tree/develop)
 
+## [1.2.1](https://github.com/idealista/fluentd-role/tree/1.2.1)
+## [Full Changelog](https://github.com/idealista/fluentd-role/compare/1.2.0...1.2.1)
+### Fixed
+- *[#17](https://github.com/idealista/fluentd-role/issues/17) Fixing service kill* @dortegau
+
+
 ## [1.2.0](https://github.com/idealista/fluentd-role/tree/1.2.0)
 ## [Full Changelog](https://github.com/idealista/fluentd-role/compare/1.1.2...1.2.0)
 ## Added

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/idealista/fluentd-role.svg?branch=master)](https://travis-ci.org/idealista/fluentd-role)
 # Fluentd Ansible role
 
-This ansible role installs fluent agent in a debian environment.
+This ansible role installs fluent agent in a Debian environment.
 
 - [Getting Started](#getting-started)
 	- [Prerequisities](#prerequisities)
@@ -18,7 +18,7 @@ This ansible role installs fluent agent in a debian environment.
 
 ## Getting Started
 
-These instructions will get you a copy of the role for your ansible playbook. Once launched, it will install a [fluentd](https://fluentd.io/) agent.
+These instructions will get you a copy of the role for your Ansible playbook. Once launched, it will install a [fluentd](https://fluentd.io/) agent.
 
 ### Prerequisities
 
@@ -81,9 +81,9 @@ See also the list of [contributors](https://github.com/idealista/fluentd-role/co
 
 ## License
 
-![Apache 2.0 Licence](https://img.shields.io/hexpm/l/plug.svg)
+![Apache 2.0 License](https://img.shields.io/hexpm/l/plug.svg)
 
-This project is licensed under the [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) license - see the [LICENSE.txt](LICENSE.txt) file for details.
+This project is licensed under the [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) license - see the [LICENSE](LICENSE) file for details.
 
 ## Contributing
 

meta/main.yml

@@ -1,6 +1,6 @@
 ---
 galaxy_info:
-  company: Idealista S.A.
+  company: Idealista S.A.U
   description: Fluentd is a data collector for unified logging layer.
   min_ansible_version: 2.2.1.0
   license: Apache 2.0

templates/fluentd/fluentd.service.j2

@@ -11,8 +11,9 @@ User={{ fluentd_user }}
 Group={{ fluentd_group }}
 
 ExecStart=/usr/local/bin/fluentd -d /run/fluentd/fluentd.pid -c {{ fluentd_conf_path }}/fluent.conf -o {{ fluentd_log_file }}
-ExecStop=/usr/bin/kill $MAINPID
+ExecStop=/bin/kill $MAINPID
 Restart=always
+KillSignal=SIGTERM
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target