PUP-3615

CHANGELOG.md

@@ -1,3 +1,7 @@
+###0.9.1
+
+Fix compatibility with future parser in Puppet 3.7.4 ([PUP-3615](https://tickets.puppetlabs.com/browse/PUP-3615))
+
 ###0.9.0
 
 **Warning:** this release is a big step forward, please read the documentation carefully

manifests/install/package.pp

@@ -23,7 +23,7 @@
   }
 
   # fix broken bits in some tomcat init scripts
-  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease < 7 { #fix 'status' command for instances
+  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease < '7' { #fix 'status' command for instances
     file_line { 'fix broken tomcat init script':
       path     => "/etc/init.d/${::tomcat::service_name_real}",
       line     => "            pid=\"$(/usr/bin/pgrep -d , -u \${TOMCAT_USER} -G \${TOMCAT_USER} -f Dcatalina.base=\${CATALINA_BASE})\"",
@@ -32,7 +32,7 @@
       require  => Package['tomcat server']
     }
   }
-  elsif $::osfamily == 'Debian' and $::tomcat::maj_version > 6 { #support symlinking init script to create instances
+  elsif $::osfamily == 'Debian' and $::tomcat::maj_version > '6' { #support symlinking init script to create instances
     file_line { 'fix broken tomcat init script':
       path    => "/etc/init.d/${::tomcat::service_name_real}",
       line    => "NAME=\"$(basename \$0)\"",

manifests/instance.pp

@@ -272,7 +272,7 @@
   if $service_start == undef {
     case $::tomcat::install_from {
       'package' : {
-        if $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= 20 {
+        if $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= '20' {
           $service_start_real = '/usr/libexec/tomcat/server start'
         }
         else {
@@ -294,7 +294,7 @@
   if $service_stop == undef {
     case $::tomcat::install_from {
       'package' : {
-        if $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= 20 {
+        if $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= '20' {
           $service_stop_real = '/usr/libexec/tomcat/server stop'
         }
         else {
@@ -432,7 +432,7 @@
         group   => 'root',
         content => template("${module_name}/instance/systemd_unit_suse.erb")
       }
-    } elsif $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= 20 { # Fedora 20+
+    } elsif $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= '20' { # Fedora 20+
       file { "${service_name_real} service unit":
         path    => "/usr/lib/systemd/system/${service_name_real}.service",
         owner   => 'root',

manifests/service/archive.pp

@@ -17,7 +17,7 @@
         group   => 'root',
         content => template("${module_name}/instance/systemd_unit_suse.erb")
       }
-    } elsif $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= 20 { # Fedora 20+
+    } elsif $::operatingsystem == 'Fedora' and $::operatingsystemmajrelease >= '20' { # Fedora 20+
       file { "${::tomcat::service_name_real} service unit":
         path    => "/usr/lib/systemd/system/${::tomcat::service_name_real}.service",
         owner   => 'root',

metadata.json

@@ -2,7 +2,7 @@
   "name": "aco-tomcat",
   "summary": "Puppet module for Tomcat",
   "author": "Antoine Cotten",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "Apache-2.0",
   "project_page": "https://github.com/tOnI0/aco-tomcat",
   "source": "git://github.com/tOnI0/aco-tomcat.git",