Fix for camptocamp#120. Rename jakarta-commons-logging to apache-comm…

…ons-logging in centos7
sbaryakov · Jul 2, 2015 · 5410f37 · 5410f37
1 parent 4f1bad3
commit 5410f37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/manifests/logging.pp b/manifests/logging.pp
@@ -16,7 +16,7 @@
 
   $log4j_packages = $::osfamily? {
     'Debian' => ['liblog4j1.2-java', 'libcommons-logging-java'],
-    'RedHat' => ['log4j', 'jakarta-commons-logging'],
+    'RedHat' => ['log4j', "$::tomcat::params::commons_logging_package"],
   }
 
   package {$log4j_packages:

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -19,16 +19,19 @@
         '5': {
           $version = '5'
           $systemd = false
+          $commons_logging_package = 'jakarta-commons-logging'
         }
 
         '6': {
           $version = '6'
           $systemd = false
+          $commons_logging_package = 'jakarta-commons-logging'
         }
 
         '7': {
           $version = '7'
           $systemd = true
+          $commons_logging_package = 'apache-commons-logging'
         }
 
         default: {