From f6710676eb7f5697cc4859842002eed66706f395 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <tonio.cotten@gmail.com>
Date: Mon, 9 Feb 2015 14:26:54 +0100
Subject: [PATCH] reintroduce minor changes lost during merging

---
 CHANGELOG.md          | 1 +
 manifests/instance.pp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d621d..e26a27d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Enable multi-version tomcat installation
 * New parameter `log_path`: define log directory
+* Fix issue with generic init script always returning 0
 
 ###0.9.1
 
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 32fb413..16b7f78 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -522,13 +522,13 @@
 
     "instance ${name} logs directory":
       ensure => directory,
-      path   => "/var/log/${service_name_real}",
+      path   => $log_path_real,
       mode   => '0660';
 
     "instance ${name} logs symlink":
       ensure => link,
       path   => "${catalina_base_real}/logs",
-      target => "/var/log/${service_name_real}",
+      target => $log_path_real,
       mode   => '0777',
       force  => true,
       tag    => 'instance_tree';