reintroduce minor changes lost during merging

antoineco · Feb 9, 2015 · f671067 · f671067
1 parent 7b13913
commit f671067
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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';