Skip to content

Commit 7b2fb92

Browse files
authored
Merge pull request #277 from ghoneycutt/ubuntu2404
Ubuntu2404
2 parents b0c0c52 + cd7444a commit 7b2fb92

File tree

8 files changed

+101
-2
lines changed

8 files changed

+101
-2
lines changed

.github/workflows/ci.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
- "debian-12"
6262
- "ubuntu-2004"
6363
- "ubuntu-2204"
64+
- "ubuntu-2404"
6465
puppet:
6566
- "puppet7"
6667
- "puppet8"

.sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
- el8
1313
- el9
1414
- debian-11
15+
- debian-12
1516
- ubuntu-2004
1617
- ubuntu-2204
18+
- ubuntu-2404
1719
puppet:
1820
- puppet7
1921
- puppet8

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ module aims to support the current and previous major Puppet versions.
280280
* Debian 12
281281
* Ubuntu 20.04 LTS
282282
* Ubuntu 22.04 LTS
283+
* Ubuntu 24.04 LTS
283284

284285
### May work
285286

data/os/Ubuntu/24.04.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
pam::common_files_create_links: false
3+
pam::common_files_suffix: ~
4+
pam::common_files:
5+
- common_account
6+
- common_auth
7+
- common_password
8+
- common_session
9+
- common_session_noninteractive
10+
11+
pam::sshd_pam_access: absent
12+
pam::pam_d_login_template: pam/login.ubuntu24.erb
13+
pam::pam_d_sshd_template: pam/sshd.ubuntu24.erb
14+
pam::package_name: libpam0g
15+
pam::pam_auth_lines:
16+
- 'auth [success=1 default=ignore] pam_unix.so nullok'
17+
- 'auth requisite pam_deny.so'
18+
- 'auth required pam_permit.so'
19+
- 'auth optional pam_cap.so'
20+
pam::pam_account_lines:
21+
- 'account [success=1 new_authtok_reqd=done default=ignore] pam_unix.so'
22+
- 'account requisite pam_deny.so'
23+
- 'account required pam_permit.so'
24+
pam::pam_password_lines:
25+
- 'password [success=1 default=ignore] pam_unix.so obscure yescrypt'
26+
- 'password requisite pam_deny.so'
27+
- 'password required pam_permit.so'
28+
pam::pam_session_lines:
29+
- 'session [default=1] pam_permit.so'
30+
- 'session requisite pam_deny.so'
31+
- 'session required pam_permit.so'
32+
- 'session optional pam_umask.so'
33+
- 'session required pam_unix.so'
34+
- 'session optional pam_systemd.so'

metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@
8585
"operatingsystem": "Ubuntu",
8686
"operatingsystemrelease": [
8787
"20.04",
88-
"22.04"
88+
"22.04",
89+
"24.04"
8990
]
9091
}
9192
],
@@ -96,7 +97,7 @@
9697
}
9798
],
9899
"description": "Manages PAM, including specifying users and groups in access.conf, limits.conf, and limits fragments",
99-
"pdk-version": "3.0.0",
100+
"pdk-version": "3.3.0",
100101
"template-url": "https://github.com/tailored-automation/pdk-templates#main",
101102
"template-ref": "heads/main-0-g8e0611a"
102103
}
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
HOSTS:
2+
ubuntu2404:
3+
roles:
4+
- agent
5+
platform: ubuntu-24.04-amd64
6+
hypervisor : docker
7+
image: ubuntu:24.04
8+
docker_preserve_image: true
9+
docker_cmd: '["/sbin/init"]'
10+
docker_image_commands:
11+
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
12+
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
13+
- 'locale-gen en_US.UTF-8'
14+
docker_env:
15+
- LANG=en_US.UTF-8
16+
- LANGUAGE=en_US.UTF-8
17+
- LC_ALL=en_US.UTF-8
18+
docker_container_name: 'pam-ubuntu2404'
19+
CONFIG:
20+
log_level: debug
21+
type: foss
22+
ssh:
23+
password: root
24+
auth_methods: ["password"]

templates/login.ubuntu24.erb

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
auth optional pam_faildelay.so delay=3000000
2+
auth requisite pam_nologin.so
3+
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
4+
session required pam_loginuid.so
5+
session optional pam_motd.so motd=/run/motd.dynamic
6+
session optional pam_motd.so noupdate
7+
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
8+
session required pam_env.so readenv=1
9+
session required pam_env.so readenv=1 envfile=/etc/default/locale
10+
@include common-auth
11+
auth optional pam_group.so
12+
session required pam_limits.so
13+
session optional pam_lastlog.so
14+
session optional pam_mail.so standard
15+
session optional pam_keyinit.so force revoke
16+
@include common-account
17+
@include common-session
18+
@include common-password

templates/sshd.ubuntu24.erb

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
@include common-auth
2+
account required pam_nologin.so
3+
<% if @sshd_pam_access != 'absent' -%>
4+
account <%= @sshd_pam_access %> pam_access.so
5+
<% end -%>
6+
@include common-account
7+
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
8+
session required pam_loginuid.so
9+
session optional pam_keyinit.so force revoke
10+
@include common-session
11+
session optional pam_motd.so motd=/run/motd.dynamic
12+
session optional pam_motd.so noupdate
13+
session optional pam_mail.so standard noenv # [1]
14+
session required pam_limits.so
15+
session required pam_env.so # [1]
16+
session required pam_env.so user_readenv=1 envfile=/etc/default/locale
17+
session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
18+
@include common-password

0 commit comments

Comments
 (0)