From 7a68ff076a483a79a4d991610f62a10cde36c705 Mon Sep 17 00:00:00 2001 From: Santiago Orobon Date: Mon, 19 Mar 2018 16:35:01 +0100 Subject: [PATCH 1/4] [#49] Update tomcat version to 8.5.29 #49 --- defaults/main.yml | 2 +- templates/setenv.sh.j2 | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c93d122..b6cd04d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- ## General -tomcat_version: 8.5.28 +tomcat_version: 8.5.29 ## Service options diff --git a/templates/setenv.sh.j2 b/templates/setenv.sh.j2 index aeeb84c..b081ebb 100644 --- a/templates/setenv.sh.j2 +++ b/templates/setenv.sh.j2 @@ -7,8 +7,6 @@ export CATALINA_OPTS="$CATALINA_OPTS {{ option }}" {% if tomcat_agents_config is defined %} if [ -r "$CATALINA_BASE/bin/setagentenv.sh" ]; then . "$CATALINA_BASE/bin/setagentenv.sh" -elif [ -r "$CATALINA_HOME/bin/setagentenv.sh" ]; then - . "$CATALINA_HOME/bin/setagentenv.sh" fi {% endif %} From 33b2062cd1bc8e0a83573d172f8b68e267f91449 Mon Sep 17 00:00:00 2001 From: Santiago Orobon Date: Mon, 19 Mar 2018 16:59:44 +0100 Subject: [PATCH 2/4] [#49] Update tomcat version to 8.5.29 (restored sentenv.sh.j2) --- templates/setenv.sh.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/setenv.sh.j2 b/templates/setenv.sh.j2 index b081ebb..aeeb84c 100644 --- a/templates/setenv.sh.j2 +++ b/templates/setenv.sh.j2 @@ -7,6 +7,8 @@ export CATALINA_OPTS="$CATALINA_OPTS {{ option }}" {% if tomcat_agents_config is defined %} if [ -r "$CATALINA_BASE/bin/setagentenv.sh" ]; then . "$CATALINA_BASE/bin/setagentenv.sh" +elif [ -r "$CATALINA_HOME/bin/setagentenv.sh" ]; then + . "$CATALINA_HOME/bin/setagentenv.sh" fi {% endif %} From 9e0ab302298f26b36a6fd02ea2da328117d9affe Mon Sep 17 00:00:00 2001 From: Santiago Orobon Date: Mon, 19 Mar 2018 18:21:51 +0100 Subject: [PATCH 3/4] [#49] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7edaec7..3ed1dd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## [Unreleased](https://github.com/idealista/tomcat-role/tree/develop) +### Changed +- *[#49](https://github.com/idealista/tomcat-role/issues/49) Updated tomcat version to 8.5.29* @sorobon ## [1.6.1](https://github.com/idealista/tomcat-role/tree/1.6.1) ### Changed From e1e223734024397dae2bc98919948c12b4f8f528 Mon Sep 17 00:00:00 2001 From: Santiago Orobon Date: Mon, 19 Mar 2018 18:29:50 +0100 Subject: [PATCH 4/4] release 1.6.2 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ed1dd3..39bc431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## [Unreleased](https://github.com/idealista/tomcat-role/tree/develop) + +## [1.6.2](https://github.com/idealista/tomcat-role/tree/1.6.2) ### Changed - *[#49](https://github.com/idealista/tomcat-role/issues/49) Updated tomcat version to 8.5.29* @sorobon