Skip to content

Commit d55f201

Browse files
committed
Be more precise in package selection
1 parent 0f4c3ee commit d55f201

File tree

1 file changed

+42
-23
lines changed

1 file changed

+42
-23
lines changed

manifests/params.pp

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -341,35 +341,54 @@
341341
}
342342
$_os_mod_packages = case $facts['os']['name'] {
343343
'Debian': {
344-
if versioncmp($facts['os']['release']['major'], '11') < 0 {
345-
{
346-
'auth_kerb' => 'libapache2-mod-auth-kerb',
347-
'nss' => 'libapache2-mod-nss',
348-
'shib2' => 'libapache2-mod-shib2',
349-
'wsgi' => 'libapache2-mod-wsgi',
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+
}
350352
}
351-
}
352-
else {
353-
{
354-
'shib2' => 'libapache2-mod-shib',
355-
'wsgi' => 'libapache2-mod-wsgi-py3',
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+
356366
}
357367
}
358368
}
359369
'Ubuntu': {
360-
if versioncmp($facts['os']['release']['major'], '22.04') < 0 {
361-
{
362-
'auth_kerb' => 'libapache2-mod-auth-kerb',
363-
'nss' => 'libapache2-mod-nss',
364-
'shib2' => 'libapache2-mod-shib2',
365-
'wsgi' => 'libapache2-mod-wsgi',
370+
case $facts['os']['release']['major'] {
371+
'18.04': {
372+
{
373+
'auth_kerb' => 'libapache2-mod-auth-kerb',
374+
'nss' => 'libapache2-mod-nss',
375+
'shib2' => 'libapache2-mod-shib2',
376+
'wsgi' => 'libapache2-mod-wsgi',
377+
}
366378
}
367-
}
368-
else {
369-
{
370-
'auth_kerb' => 'libapache2-mod-auth-kerb',
371-
'shib2' => 'libapache2-mod-shib',
372-
'wsgi' => 'libapache2-mod-wsgi-py3',
379+
'20.04': {
380+
{
381+
'auth_kerb' => 'libapache2-mod-auth-kerb',
382+
'shib2' => 'libapache2-mod-shib2',
383+
'wsgi' => 'libapache2-mod-wsgi',
384+
}
385+
}
386+
default: {
387+
{
388+
'auth_kerb' => 'libapache2-mod-auth-kerb',
389+
'shib2' => 'libapache2-mod-shib',
390+
'wsgi' => 'libapache2-mod-wsgi-py3',
391+
}
373392
}
374393
}
375394
}

0 commit comments

Comments
 (0)