Merge pull request #1292 from cholyoak/shib2_debian

Fixes paths and packages for the shib2 module on Debian
puppetlabs · Jan 11, 2016 · ca432ee · ca432ee
2 parents 8a350af + 4ae775a
commit ca432ee
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -224,13 +224,20 @@
       'python'      => 'libapache2-mod-python',
       'rpaf'        => 'libapache2-mod-rpaf',
       'security'    => 'libapache2-modsecurity',
+      'shib2'       => 'libapache2-mod-shib2',
       'suphp'       => 'libapache2-mod-suphp',
       'wsgi'        => 'libapache2-mod-wsgi',
       'xsendfile'   => 'libapache2-mod-xsendfile',
       'shib2'       => 'libapache2-mod-shib2',
     }
+    if $::osfamily == 'Debian' and versioncmp($::operatingsystemrelease, '8') < 0 {
+      $shib2_lib = 'mod_shib_22.so'
+    } else {
+      $shib2_lib = 'mod_shib2.so'
+    }
     $mod_libs             = {
-      'php5' => 'libphp5.so',
+      'php5'  => 'libphp5.so',
+      'shib2' => $shib2_lib
     }
     $conf_template          = 'apache/httpd.conf.erb'
     $keepalive              = 'Off'