Merge pull request #10 from idealista/develop

Fix #6 and #8

CHANGELOG.md

@@ -4,6 +4,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/tomcat-role/tree/develop)
 
+## [1.1.2](https://github.com/idealista/tomcat-role/tree/1.1.2)
+
+### Fixed
+- *[#8](https://github.com/idealista/tomcat-role/issues/8) Fix systemd startup* @jmonterrubio
+- *[#6](https://github.com/idealista/tomcat-role/issues/6) Fix conf directory template copy* @jnogol
+
 ## [1.1.0](https://github.com/idealista/tomcat-role/tree/1.1.0)
 
 ### Added
@@ -13,4 +19,4 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 ## [1.0.0](https://github.com/idealista/tomcat-role/tree/1.0.0)
 
 ### Added
-- *First release*
+- *First release*

README.md

@@ -1,4 +1,5 @@
 ![Logo](https://raw.githubusercontent.com/idealista/tomcat-role/master/logo.gif)
+
 [![Build Status](https://travis-ci.org/idealista/tomcat-role.svg?branch=master)](https://travis-ci.org/idealista/tomcat-role)
 # Tomcat Ansible role
 
@@ -89,7 +90,7 @@ See also the list of [contributors](https://github.com/idealista/Tomcat-role/con
 
 ![Apache 2.0 Licence](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
 

tasks/config.yml

@@ -25,10 +25,10 @@
 
 - name: Tomcat | Copy extra tomcat config templates (provided by playbooks)
   template:
-    src: "{{ item }}.j2"
-    dest: "{{ tomcat_conf_path }}/{{ item | basename }}"
+    src: "{{ item }}"
+    dest: "{{ tomcat_conf_path }}/{{ item | basename | splitext | first }}" # This is to remove .j2 extension
     owner: "{{ tomcat_user }}"
     group: "{{ tomcat_group }}"
     mode: 0640
   with_fileglob:
-    - "{{ tomcat_extra_conf_template_path }}/*"
+    - "{{ tomcat_extra_conf_template_path }}/*"

templates/tomcat.service.j2

@@ -1,11 +1,17 @@
 [Unit]
 Description=Apache Tomcat Web Application Container
 After=network.target
+
 [Service]
 Type=forking
+
+WorkingDirectory={{ tomcat_install_path }}
+
 ExecStart={{ tomcat_bin_path }}/startup.sh
 ExecStop={{ tomcat_bin_path }}/shutdown.sh
+
 User={{ tomcat_user }}
 Group={{ tomcat_group }}
+
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target