Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Override few variables for Ubuntu 22.04 #11928

Merged
merged 8 commits into from
May 6, 2024
Merged

Override few variables for Ubuntu 22.04 #11928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f340077
Redefine vlock package name for Ubuntu 22.04
mpurg May 2, 2024
ae32a0e
Redefine pam_pkcs11 package name for Ubuntu 22.04
mpurg May 2, 2024
6c803bf
Redefine opensc package name for Ubuntu 22.04
mpurg May 2, 2024
b276b19
Redefine apparmor package name for Ubuntu 22.04
mpurg May 2, 2024
9dfce21
Redefine /var/log group owner for Ubuntu 22.04
mpurg May 2, 2024
00b009f
Redefine gdm package name for Ubuntu 22.04
mpurg May 2, 2024
6cf7717
Redefine ssh service name for Ubuntu 22.04
mpurg May 2, 2024
d12d4ab
Fix failing test on Ubuntu
mpurg May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions linux_os/guide/services/ssh/service_sshd_enabled/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ template:
servicename@ubuntu1604: ssh
servicename@ubuntu1804: ssh
servicename@ubuntu2004: ssh
servicename@ubuntu2204: ssh
packagename: openssh-server
packagename@sle12: openssh
packagename@sle15: openssh
Expand Down
1 change: 1 addition & 0 deletions ...accounts/accounts-physical/screen_locking/console_screen_locking/vlock_installed/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ template:
pkgname@ubuntu1604: vlock
pkgname@ubuntu1804: vlock
pkgname@ubuntu2004: vlock
pkgname@ubuntu2204: vlock
1 change: 1 addition & 0 deletions ...nts/accounts-physical/screen_locking/smart_card_login/install_smartcard_packages/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ template:
pkgname@ubuntu1604: libpam-pkcs11
pkgname@ubuntu1804: libpam-pkcs11
pkgname@ubuntu2004: libpam-pkcs11
pkgname@ubuntu2204: libpam-pkcs11
{{% endif %}}

fixtext: |-
Expand Down
1 change: 1 addition & 0 deletions ...ounts/accounts-physical/screen_locking/smart_card_login/package_opensc_installed/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ template:
pkgname@ubuntu1604: opensc-pkcs11
pkgname@ubuntu1804: opensc-pkcs11
pkgname@ubuntu2004: opensc-pkcs11
pkgname@ubuntu2204: opensc-pkcs11

fixtext: |-
{{% if 'ubuntu' not in product %}}
Expand Down
1 change: 1 addition & 0 deletions linux_os/guide/system/apparmor/apparmor_configured/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,5 @@ template:
packagename@ubuntu1604: apparmor
packagename@ubuntu1804: apparmor
packagename@ubuntu2004: apparmor
packagename@ubuntu2204: apparmor
packagename@debian12: apparmor
1 change: 1 addition & 0 deletions ...s/guide/system/permissions/files/permissions_var_log_dir/file_groupowner_var_log/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ template:
gid_or_name@ubuntu1604: '110'
gid_or_name@ubuntu1804: '110'
gid_or_name@ubuntu2004: '110'
gid_or_name@ubuntu2204: syslog

fixtext: |-
{{{ describe_file_group_owner(file="/var/log", group=gid) }}}
Expand Down
1 change: 1 addition & 0 deletions linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,4 @@ template:
pkgname@ubuntu1604: gdm3
pkgname@ubuntu1804: gdm3
pkgname@ubuntu2004: gdm3
pkgname@ubuntu2204: gdm3
2 changes: 1 addition & 1 deletion shared/templates/service_enabled/tests/service_disabled.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
{{% if SERVICENAME == "sshd" %}}
{{% if SERVICENAME in ["ssh", "sshd"] %}}
# platform = Not Applicable
{{% endif %}}
# packages = {{{ PACKAGENAME }}}
Expand Down
Loading