Skip to content

Commit 1f2638c

Browse files
authored
Merge pull request Puppet-Finland#59 from flichtenheld/u24+arm64
Improved compatibility (Ubuntu 24, arm64)
2 parents f773b56 + 832ff5b commit 1f2638c

File tree

3 files changed

+16
-30
lines changed

3 files changed

+16
-30
lines changed

manifests/install/client/debian.pp

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,20 @@
44
# This code is needed as the --mkhomedir parameter passed to ipa-client-install does
55
# not configure PAM even though it does install the required packages.
66
#
7-
# Currently Ubuntu 14.04/16.04 and Debian 8/9 are supported.
8-
#
97
class easy_ipa::install::client::debian {
10-
case $facts['os']['distro']['codename'] {
11-
/^(xenial|stretch|bionic|focal|buster|bullseye|jammy|bookworm)$/: {
12-
# Ensure that required packages are present even if they do not get pulled
13-
# in as freeipa-client package dependencies
14-
stdlib::ensure_packages(['oddjob','oddjob-mkhomedir'], { 'ensure' => 'present' })
8+
# Ensure that required packages are present even if they do not get pulled
9+
# in as freeipa-client package dependencies
10+
stdlib::ensure_packages(['oddjob','oddjob-mkhomedir'], { 'ensure' => 'present' })
1511

16-
# This should preferably be in a separate Puppet module
17-
service { 'oddjobd':
18-
ensure => 'running',
19-
enable => true,
20-
name => 'oddjobd',
21-
}
22-
$mkhomedir_line = 'session optional /lib/x86_64-linux-gnu/security/pam_oddjob_mkhomedir.so'
23-
$notify = Service['oddjobd']
24-
}
25-
/^(trusty|jessie)$/: {
26-
$mkhomedir_line = 'session required pam_mkhomedir.so skel=/etc/skel/ umask=0022'
27-
$notify = undef
28-
}
29-
default: {
30-
fail('ERROR: unsupported Debian/Ubuntu version!')
31-
}
12+
# This should preferably be in a separate Puppet module
13+
service { 'oddjobd':
14+
ensure => 'running',
15+
enable => true,
16+
name => 'oddjobd',
3217
}
18+
$arch = $facts['os']['hardware']
19+
$mkhomedir_line = "session optional /lib/${arch}-linux-gnu/security/pam_oddjob_mkhomedir.so"
20+
$notify = Service['oddjobd']
3321

3422
file_line { 'mkhomedir':
3523
ensure => 'present',

manifests/params.pp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
$named_conf_d = '/etc/named/conf.d'
1616
}
1717
'Debian': {
18-
case $facts['os']['distro']['codename'] {
19-
/(trusty|xenial|bionic|buster|focal|bullseye|jammy|bookworm)/: { $ipa_client_package_ensure = 'present' }
20-
/(stretch)/: { $ipa_client_package_ensure = 'absent' }
21-
default: { fail('ERROR: unsupported operating system') }
22-
}
18+
$ipa_client_package_ensure = 'present'
2319
$ldaputils_package_name = 'ldap-utils'
2420
$ipa_client_package_name = 'freeipa-client'
2521
}

metadata.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,17 @@
4848
"operatingsystem": "Debian",
4949
"operatingsystemrelease": [
5050
"10",
51-
"11"
51+
"11",
52+
"12"
5253
]
5354
},
5455
{
5556
"operatingsystem": "Ubuntu",
5657
"operatingsystemrelease": [
5758
"18.04",
5859
"20.04",
59-
"22.04"
60+
"22.04",
61+
"24.04"
6062
]
6163
}
6264
],

0 commit comments

Comments
 (0)