Merge pull request #714 from mhaskel/pagespeed

Use access_compat on 2.4, and update pagespeed to load the correct modul...
xbezdick · May 2, 2014 · 492ef10 · 492ef10
2 parents ca03c51 + 15b3adc
commit 492ef10
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp
@@ -121,6 +121,9 @@
 
       # filter is needed by mod_deflate
       ::apache::mod { 'filter': }
+
+      # lots of stuff seems to break without access_compat
+      ::apache::mod { 'access_compat': }
     } else {
       ::apache::mod { 'authz_default': }
     }

diff --git a/manifests/mod/pagespeed.pp b/manifests/mod/pagespeed.pp
@@ -34,7 +34,14 @@
   $additional_configuration      = {},
 ){
 
-  apache::mod { 'pagespeed': }
+  $_lib = $::apache::apache_version ? {
+    2.4     => 'mod_pagespeed_ap24.so',
+    default => undef
+  }
+
+  apache::mod { 'pagespeed':
+    lib => $_lib,
+  }
 
   file { 'pagespeed.conf':
     ensure  => file,
@@ -44,5 +51,4 @@
     before  => File[$::apache::mod_dir],
     notify  => Service['httpd'],
   }
-
 }