From 8a7714bad7f1872e79a79bdca36d198b06c8e674 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <tonio.cotten@gmail.com>
Date: Fri, 26 Dec 2014 19:20:15 +0100
Subject: [PATCH] v0.5.3

* Removed `root_path` parameter from main class (redundant with
`catalina_home`)
---
 CHANGELOG.md      |  4 ++++
 README.md         | 20 +++++++-------------
 manifests/init.pp | 11 +++--------
 metadata.json     |  2 +-
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e4adb..9cf2394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+###0.5.3
+
+* Removed `root_path` parameter from main class (redundant with `catalina_home`)
+
 ###0.5.2
 
 * `installation_support` renamed to `install_from`
diff --git a/README.md b/README.md
index 83d77f1..ac6b482 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,11 @@ Create a tomcat instance
 
 **Parameters within `tomcat::instance`:**
 
-No instance-specific parameters. See [Common parameters](#common-parameters)
+#####`root_path`
+Absolute path to the root of all tomcat instances. Defaults to `/opt/tomcat_instances`.  
+*Note:* instances will be installed in `${root_path}/${title}` and $CATALINA_BASE will be set to that folder
+
+See also [Common parameters](#common-parameters)
 
 ####Common parameters
 
@@ -210,12 +214,6 @@ Parameters common to both `tomcat` and `tomcat::instance`
 
 **Packages and service**
 
-#####`root_path`
-Absolute path to the root of all tomcat instances. This parameter is ignored in the global context, unless tomcat was installed from archive. Defaults to `/opt` (global) / `/opt/tomcat_instances` (instance).  
-*Notes:*
-* the main instance will be installed in `${root_path}/tomcat-${version}` (if installed from archive) and both $CATALINA_HOME and $CATALINA_BASE will be set to that folder 
-* other instances will be installed in `${root_path}/${title}` (in all cases) and $CATALINA_BASE will be set to that folder
-
 #####`service_name`
 Tomcat service name. Defaults to `package_name` (global) / `${package_name}_${title}` (instance).
 
@@ -325,14 +323,10 @@ Absolute path to the environment configuration (*setenv*). Default depends on th
 Please see [catalina.sh](http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/bin/catalina.sh) for a description of the following environment variables.
 
 #####`catalina_home`
-$CATALINA_HOME. Default:
-* package: *platform specific*
-* archive: `${root_path}/tomcat-${version}`
+$CATALINA_HOME. Default depends on the platform.
 
 #####`catalina_base`
-$CATALINA_BASE. Default:
-* package: *platform specific*
-* archive: `${root_path}/${title}`
+$CATALINA_BASE. Default depends on the platform.
 
 #####`jasper_home`
 $JASPER_HOME. Defaults to `catalina_home`.
diff --git a/manifests/init.pp b/manifests/init.pp
index 033ccdb..9c7e41e 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -7,9 +7,7 @@
 # [*install_from*]
 #   what type of source to install from (valid: 'package'|'archive')
 # [*archive_source*]
-#   where to download archive from (*only* if installed from archive)
-# [*root_path*]
-#   root installation path (*only* if installed from archive)
+#   where to download archive from (only if installed from archive)
 # [*version*]
 #   tomcat full version number (valid format: x.y.z)
 # [*package_name*]
@@ -76,7 +74,6 @@
   #----------------------------------------------------------------------------------
   $install_from         = 'package',
   $archive_source       = undef,
-  $root_path            = '/opt',
   $version              = $::tomcat::params::version,
   $package_name         = $::tomcat::params::package_name,
   $service_name         = undef,
@@ -204,10 +201,8 @@
   }
 
   if $catalina_home == undef {
-    $catalina_home_real = $install_from ? {
-      'package' => "/usr/share/${service_name_real}",
-      default   => "${root_path}/tomcat-${version}"
-    } } else {
+    $catalina_home_real = "/usr/share/${service_name_real}"
+  } else {
     $catalina_home_real = $catalina_home
   }
 
diff --git a/metadata.json b/metadata.json
index 3b1d05b..9a34e0f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "aco-tomcat",
   "summary": "Puppet module for Tomcat",
   "author": "Antoine Cotten",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "license": "Apache-2.0",
   "project_page": "https://github.com/tOnI0/aco-tomcat",
   "source": "git://github.com/tOnI0/aco-tomcat.git",