From 4ae775a3662f668deaf6a972db48947b0fa3bafb Mon Sep 17 00:00:00 2001 From: Craig Holyoak Date: Tue, 8 Dec 2015 08:21:16 +1000 Subject: [PATCH] Fix paths and packages for the shib2 module on Debian pre Jessie --- manifests/params.pp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 9e8cad39b4..644f6788f2 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -221,13 +221,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'