Release v1.4.0

CHANGELOG.md

@@ -1,3 +1,22 @@
+###1.4.0
+
+**Warning** the `enable_extras` parameter was renamed to `extras_enable` in this release. Backward compatibility will be maintained until the next minor release only.
+
+* New parameters: `package_ensure` and `extras_package_name` ([scitechfh](https://github.com/scitechfh))
+* New parameters: `checksum_verify`, `checksum_type`, `checksum` and `extras_source` ([angrox](https://github.com/angrox))
+* Replace dependency on `puppet/staging` by `puppet/archive`
+* Align content of systemd templates on current state of official RPM packages (RedHat and derivatives)
+* Add support for Ubuntu 16.04 (Xenial), Fedora 24 and Amazon Linux 2016.03
+* Drop support for Debian 6 (Squeeze), OpenSuSE 13.1 and below, Fedora 21 and below
+* Update default package versions
+* Bug fixes:
+ - parameters left blank in systemd units on some Puppet versions
+ - work around for [PUP-1597](https://tickets.puppetlabs.com/browse/PUP-3615) on RHEL 7
+ - dependency cycle between service and context resources
+ - file permissions too strict on configuration files
+ - activation of extras/log4j not working with multi-version setups
+ - tomcat service not notified of all relevant changes
+
 ###1.3.2
 
 * New parameters: `globalnaming_environments` and `ssl_sslenabledprotocols` ([roysjosh](https://github.com/roysjosh))

README.md

@@ -666,5 +666,6 @@ Check the [puppetlabs_spec_helper](https://github.com/puppetlabs/puppetlabs_spec
 * [Frank Holtz](https://github.com/scitechfh)
 * [Vincent Kramar](https://github.com/thkrmr)
 * [Joshua Roys](https://github.com/roysjosh)
+* [Martin Zehetmayer](https://github.com/angrox)
 
 Features request and contributions are always welcome!

manifests/context.pp

@@ -29,11 +29,11 @@
 
   # generate and manage context configuration
   concat { "${name} tomcat context":
-    path   => $path,
-    owner  => $owner,
-    group  => $group,
-    mode   => '0600',
-    order  => 'numeric'
+    path  => $path,
+    owner => $owner,
+    group => $group,
+    mode  => '0600',
+    order => 'numeric'
   }
 
   # Template uses:

manifests/init.pp

@@ -108,6 +108,7 @@
   $log4j                      = false,
   $log4j_package_name         = $::tomcat::params::log4j_package_name,
   $extras_enable              = false,
+  $enable_extras              = undef, #! backward compatibility
   $extras_source              = undef,
   $extras_package_name        = undef,
   $manage_firewall            = false,
@@ -557,11 +558,19 @@
   }
   ), $host_params)
 
-  # should we download extras libs?
+  # backward compatibility after renaming parameter 'enable_extras'
+  # 'enable_extras' takes precendence over 'extras_enable' to avoid surprises
+  if $enable_extras != undef {
+    $extras_enable_compat = $enable_extras
+  } else {
+    $extras_enable_compat = $extras_enable
+  }
+
+  # should we force download extras libs?
   if $log4j_enable or $jmx_listener {
     $extras_enable_real = true
   } else {
-    $extras_enable_real = $extras_enable
+    $extras_enable_real = $extras_enable_compat
   }
 
   # start the real action

manifests/instance.pp

@@ -77,6 +77,7 @@
   $tomcat_user                = $::tomcat::tomcat_user_real,
   $tomcat_group               = $::tomcat::tomcat_group_real,
   $extras_enable              = false,
+  $enable_extras              = undef, #! backward compatibility
   $extras_source              = undef,
   $manage_firewall            = false,
   #..................................................................................
@@ -520,11 +521,19 @@
   }
   ), $host_params)
 
+  # backward compatibility after renaming parameter 'enable_extras'
+  # 'enable_extras' takes precendence over 'extras_enable' to avoid surprises
+  if $enable_extras != undef {
+    $extras_enable_compat = $enable_extras
+  } else {
+    $extras_enable_compat = $extras_enable
+  }
+
   # should we force download extras libs?
-  if ($log4j_enable or $jmx_listener) and !$::tomcat::extras_enable_real {
+  if $log4j_enable or $jmx_listener {
     $extras_enable_real = true
   } else {
-    $extras_enable_real = $extras_enable
+    $extras_enable_real = $extras_enable_compat
   }
 
   # ------------------------------------#

metadata.json

@@ -2,7 +2,7 @@
   "name": "aco-tomcat",
   "summary": "Puppet module for Tomcat",
   "author": "Antoine Cotten",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "license": "Apache-2.0",
   "project_page": "https://github.com/antoineco/aco-tomcat",
   "source": "git://github.com/antoineco/aco-tomcat.git",
@@ -37,20 +37,23 @@
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
+        "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
+        "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
+        "5",
         "6",
         "7"
       ]