Merge pull request #944 from valeriominetti/modules-825-mod_itk-fix

Modules 825 - apache2.4 - mod_itk dependency fix
xbezdick · Dec 1, 2014 · 535ac43 · 535ac43
2 parents 004ed86 + 5efcdcd
commit 535ac43
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/manifests/mod/itk.pp b/manifests/mod/itk.pp
@@ -13,8 +13,10 @@
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::itk and apache::mod::peruser on the same node')
   }
-  if defined(Class['apache::mod::prefork']) {
-    fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+  if versioncmp($apache_version, '2.4') < 0 {
+    if defined(Class['apache::mod::prefork']) {
+      fail('May not include both apache::mod::itk and apache::mod::prefork on the same node')
+    }
   }
   if defined(Class['apache::mod::worker']) {
     fail('May not include both apache::mod::itk and apache::mod::worker on the same node')

diff --git a/manifests/mod/prefork.pp b/manifests/mod/prefork.pp
@@ -10,8 +10,10 @@
   if defined(Class['apache::mod::event']) {
     fail('May not include both apache::mod::prefork and apache::mod::event on the same node')
   }
-  if defined(Class['apache::mod::itk']) {
-    fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
+  if versioncmp($apache_version, '2.4') < 0 {
+    if defined(Class['apache::mod::itk']) {
+      fail('May not include both apache::mod::prefork and apache::mod::itk on the same node')
+    }
   }
   if defined(Class['apache::mod::peruser']) {
     fail('May not include both apache::mod::prefork and apache::mod::peruser on the same node')

diff --git a/manifests/mpm.pp b/manifests/mpm.pp
@@ -45,6 +45,13 @@
           before  => File[$::apache::mod_enable_dir],
           notify  => Service['httpd'],
         }
+
+        if $mpm == 'itk' {
+            file { "${lib_path}/mod_mpm_itk.so":
+              ensure  => link,
+              target  => "${lib_path}/mpm_itk.so"
+            }
+        }
       }
 
       if versioncmp($apache_version, '2.4') < 0 {