Skip to content

Commit 068fe84

Browse files
committed
Add required package for kerberos auth on jammy
1 parent ef446ff commit 068fe84

File tree

1 file changed

+76
-51
lines changed

1 file changed

+76
-51
lines changed

manifests/params.pp

Lines changed: 76 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -317,60 +317,85 @@
317317
'22.04' => '8.1', # Ubuntu Jammy
318318
default => '7.2', # Ubuntu Bionic, Cosmic and Disco
319319
}
320-
if (($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['major'], '22.04') < 0) or
321-
($facts['os']['name'] == 'Debian' and versioncmp($facts['os']['release']['major'], '11') < 0)) {
322-
$mod_packages = {
323-
'apreq2' => 'libapache2-mod-apreq2',
324-
'auth_cas' => 'libapache2-mod-auth-cas',
325-
'auth_kerb' => 'libapache2-mod-auth-kerb',
326-
'auth_openidc' => 'libapache2-mod-auth-openidc',
327-
'auth_gssapi' => 'libapache2-mod-auth-gssapi',
328-
'auth_mellon' => 'libapache2-mod-auth-mellon',
329-
'authnz_pam' => 'libapache2-mod-authnz-pam',
330-
'dav_svn' => 'libapache2-mod-svn',
331-
'fcgid' => 'libapache2-mod-fcgid',
332-
'geoip' => 'libapache2-mod-geoip',
333-
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
334-
'jk' => 'libapache2-mod-jk',
335-
'lookup_identity' => 'libapache2-mod-lookup-identity',
336-
'nss' => 'libapache2-mod-nss',
337-
'pagespeed' => 'mod-pagespeed-stable',
338-
'passenger' => 'libapache2-mod-passenger',
339-
'perl' => 'libapache2-mod-perl2',
340-
'phpXXX' => 'libapache2-mod-phpXXX',
341-
'python' => 'libapache2-mod-python',
342-
'rpaf' => 'libapache2-mod-rpaf',
343-
'security' => 'libapache2-mod-security2',
344-
'shib2' => 'libapache2-mod-shib2',
345-
'wsgi' => 'libapache2-mod-wsgi',
346-
'xsendfile' => 'libapache2-mod-xsendfile',
320+
$_base_mod_packages = {
321+
'apreq2' => 'libapache2-mod-apreq2',
322+
'auth_cas' => 'libapache2-mod-auth-cas',
323+
'auth_openidc' => 'libapache2-mod-auth-openidc',
324+
'auth_gssapi' => 'libapache2-mod-auth-gssapi',
325+
'auth_mellon' => 'libapache2-mod-auth-mellon',
326+
'authnz_pam' => 'libapache2-mod-authnz-pam',
327+
'dav_svn' => 'libapache2-mod-svn',
328+
'fcgid' => 'libapache2-mod-fcgid',
329+
'geoip' => 'libapache2-mod-geoip',
330+
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
331+
'jk' => 'libapache2-mod-jk',
332+
'lookup_identity' => 'libapache2-mod-lookup-identity',
333+
'pagespeed' => 'mod-pagespeed-stable',
334+
'passenger' => 'libapache2-mod-passenger',
335+
'perl' => 'libapache2-mod-perl2',
336+
'phpXXX' => 'libapache2-mod-phpXXX',
337+
'python' => 'libapache2-mod-python',
338+
'rpaf' => 'libapache2-mod-rpaf',
339+
'security' => 'libapache2-mod-security2',
340+
'xsendfile' => 'libapache2-mod-xsendfile',
341+
}
342+
$_os_mod_packages = case $facts['os']['name'] {
343+
'Debian': {
344+
case $facts['os']['release']['major'] {
345+
'9': {
346+
{
347+
'auth_kerb' => 'libapache2-mod-auth-kerb',
348+
'nss' => 'libapache2-mod-nss',
349+
'shib2' => 'libapache2-mod-shib2',
350+
'wsgi' => 'libapache2-mod-wsgi',
351+
}
352+
}
353+
'10': {
354+
{
355+
'auth_kerb' => 'libapache2-mod-auth-kerb',
356+
'shib2' => 'libapache2-mod-shib2',
357+
'wsgi' => 'libapache2-mod-wsgi',
358+
}
359+
}
360+
default: {
361+
{
362+
'shib2' => 'libapache2-mod-shib',
363+
'wsgi' => 'libapache2-mod-wsgi-py3',
364+
}
365+
}
366+
}
347367
}
348-
} else {
349-
$mod_packages = {
350-
'apreq2' => 'libapache2-mod-apreq2',
351-
'auth_cas' => 'libapache2-mod-auth-cas',
352-
'auth_openidc' => 'libapache2-mod-auth-openidc',
353-
'auth_gssapi' => 'libapache2-mod-auth-gssapi',
354-
'auth_mellon' => 'libapache2-mod-auth-mellon',
355-
'authnz_pam' => 'libapache2-mod-authnz-pam',
356-
'dav_svn' => 'libapache2-mod-svn',
357-
'fcgid' => 'libapache2-mod-fcgid',
358-
'geoip' => 'libapache2-mod-geoip',
359-
'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
360-
'jk' => 'libapache2-mod-jk',
361-
'lookup_identity' => 'libapache2-mod-lookup-identity',
362-
'pagespeed' => 'mod-pagespeed-stable',
363-
'passenger' => 'libapache2-mod-passenger',
364-
'perl' => 'libapache2-mod-perl2',
365-
'phpXXX' => 'libapache2-mod-phpXXX',
366-
'python' => 'libapache2-mod-python',
367-
'rpaf' => 'libapache2-mod-rpaf',
368-
'security' => 'libapache2-mod-security2',
369-
'shib2' => 'libapache2-mod-shib',
370-
'wsgi' => 'libapache2-mod-wsgi-py3',
371-
'xsendfile' => 'libapache2-mod-xsendfile',
368+
'Ubuntu': {
369+
case $facts['os']['release']['major'] {
370+
'18.04': {
371+
{
372+
'auth_kerb' => 'libapache2-mod-auth-kerb',
373+
'nss' => 'libapache2-mod-nss',
374+
'shib2' => 'libapache2-mod-shib2',
375+
'wsgi' => 'libapache2-mod-wsgi',
376+
}
377+
}
378+
'20.04': {
379+
{
380+
'auth_kerb' => 'libapache2-mod-auth-kerb',
381+
'shib2' => 'libapache2-mod-shib2',
382+
'wsgi' => 'libapache2-mod-wsgi',
383+
}
384+
}
385+
default: {
386+
{
387+
'auth_kerb' => 'libapache2-mod-auth-kerb',
388+
'shib2' => 'libapache2-mod-shib',
389+
'wsgi' => 'libapache2-mod-wsgi-py3',
390+
}
391+
}
392+
}
393+
}
394+
default: {
395+
{}
372396
}
373397
}
398+
$mod_packages = $_base_mod_packages + $_os_mod_packages
374399

375400
$error_log = 'error.log'
376401
$scriptalias = '/usr/lib/cgi-bin'

0 commit comments

Comments
 (0)