diff --git a/linux_os/guide/services/avahi/disable_avahi_group/package_avahi_removed/rule.yml b/linux_os/guide/services/avahi/disable_avahi_group/package_avahi_removed/rule.yml index 9e62a077de40..8e014ea513e4 100644 --- a/linux_os/guide/services/avahi/disable_avahi_group/package_avahi_removed/rule.yml +++ b/linux_os/guide/services/avahi/disable_avahi_group/package_avahi_removed/rule.yml @@ -42,5 +42,6 @@ template: name: package_removed vars: pkgname: avahi + pkgname@debian13: avahi-daemon pkgname@ubuntu2204: avahi-daemon pkgname@ubuntu2404: avahi-daemon diff --git a/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml b/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml index ac20125661b3..a59eb1542acf 100644 --- a/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml +++ b/linux_os/guide/services/avahi/disable_avahi_group/service_avahi-daemon_disabled/rule.yml @@ -47,5 +47,6 @@ template: vars: servicename: avahi-daemon packagename: avahi + packagename@debian13: avahi-daemon packagename@ubuntu2204: avahi-daemon packagename@ubuntu2404: avahi-daemon diff --git a/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml b/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml index 9e9e33fb7aea..2594286cc3c0 100644 --- a/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml +++ b/linux_os/guide/services/dns/disabling_dns_server/package_bind_removed/rule.yml @@ -45,5 +45,6 @@ template: pkgname@rhel9: - bind - bind9.18 + pkgname@debian13: bind9 pkgname@ubuntu2204: bind9 pkgname@ubuntu2404: bind9 diff --git a/linux_os/guide/services/dns/disabling_dns_server/service_named_disabled/rule.yml b/linux_os/guide/services/dns/disabling_dns_server/service_named_disabled/rule.yml index 6fdbc76b7d31..9e9b2959a12b 100644 --- a/linux_os/guide/services/dns/disabling_dns_server/service_named_disabled/rule.yml +++ b/linux_os/guide/services/dns/disabling_dns_server/service_named_disabled/rule.yml @@ -43,4 +43,5 @@ template: vars: servicename: named packagename: bind + packagename@debian13: bind9 packagename@ubuntu2404: bind9 diff --git a/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml b/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml index 02f281ed5266..af5d8c78e8bf 100644 --- a/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml +++ b/linux_os/guide/services/http/disabling_httpd/package_httpd_removed/rule.yml @@ -1,6 +1,6 @@ documentation_complete: true -{{% if 'ubuntu' in product %}} +{{% if 'ubuntu' in product or 'debian' in product %}} {{%- set package = "apache2" %}} {{% else %}} {{%- set package = "httpd" %}} diff --git a/linux_os/guide/services/http/disabling_httpd/service_httpd_disabled/rule.yml b/linux_os/guide/services/http/disabling_httpd/service_httpd_disabled/rule.yml index 5135477cefec..c0a5562167cd 100644 --- a/linux_os/guide/services/http/disabling_httpd/service_httpd_disabled/rule.yml +++ b/linux_os/guide/services/http/disabling_httpd/service_httpd_disabled/rule.yml @@ -1,6 +1,6 @@ documentation_complete: true -{{% if 'ubuntu' in product %}} +{{% if 'ubuntu' in product or 'debian' in product %}} {{% set service_name = "apache2" %}} {{% else %}} {{% set service_name = "httpd" %}} diff --git a/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml b/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml index 0a1f7f5b2a2e..d5bf8afcae11 100644 --- a/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml +++ b/linux_os/guide/services/imap/disabling_dovecot/package_dovecot_removed/rule.yml @@ -1,4 +1,4 @@ -{{% if 'ubuntu' not in product %}} +{{% if 'ubuntu' not in product and 'debian' not in product %}} {{%- set package = "dovecot" %}} {{% else %}} {{%- set package = "dovecot-core" %}} @@ -35,5 +35,6 @@ template: name: package_removed vars: pkgname: dovecot + pkgname@debian13: dovecot-core pkgname@ubuntu2204: dovecot-core pkgname@ubuntu2404: dovecot-core diff --git a/linux_os/guide/services/imap/disabling_dovecot/service_dovecot_disabled/rule.yml b/linux_os/guide/services/imap/disabling_dovecot/service_dovecot_disabled/rule.yml index 303e37bd87d2..22511e6f7e81 100644 --- a/linux_os/guide/services/imap/disabling_dovecot/service_dovecot_disabled/rule.yml +++ b/linux_os/guide/services/imap/disabling_dovecot/service_dovecot_disabled/rule.yml @@ -34,4 +34,5 @@ template: name: service_disabled vars: servicename: dovecot + packagename@debian13: dovecot-core packagename@ubuntu2404: dovecot-core diff --git a/linux_os/guide/services/ldap/openldap_client/package_openldap-clients_removed/rule.yml b/linux_os/guide/services/ldap/openldap_client/package_openldap-clients_removed/rule.yml index 5ff291774a91..9dea007eb537 100644 --- a/linux_os/guide/services/ldap/openldap_client/package_openldap-clients_removed/rule.yml +++ b/linux_os/guide/services/ldap/openldap_client/package_openldap-clients_removed/rule.yml @@ -1,6 +1,6 @@ {{% if product in ["sle12", "sle15", "slmicro5"] %}} {{%- set package = "openldap2-client" %}} -{{% elif "ubuntu" in product %}} +{{% elif "ubuntu" in product or "debian" in product %}} {{%- set package = "ldap-utils" %}} {{% else %}} {{%- set package = "openldap-clients" %}} @@ -46,3 +46,4 @@ template: pkgname@slmicro5: openldap2-client pkgname@ubuntu2204: ldap-utils pkgname@ubuntu2404: ldap-utils + pkgname@debian13: ldap-utils diff --git a/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml b/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml index 2c2f7ea7552a..68f281990ecd 100644 --- a/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml +++ b/linux_os/guide/services/ldap/openldap_server/package_openldap-servers_removed/rule.yml @@ -1,6 +1,6 @@ {{% if product in ["sle12", "sle15", "slmicro5"] %}} {{%- set package = "openldap2" %}} -{{% elif "ubuntu" in product %}} +{{% elif "debian" in product or "ubuntu" in product %}} {{%- set package = "slapd" %}} {{% else %}} {{%- set package = "openldap-servers" %}} @@ -47,6 +47,7 @@ template: name: package_removed vars: pkgname: openldap-servers + pkgname@debian13: slapd pkgname@sle12: openldap2 pkgname@sle15: openldap2 pkgname@slmicro5: openldap2 diff --git a/linux_os/guide/services/ldap/openldap_server/service_slapd_disabled/rule.yml b/linux_os/guide/services/ldap/openldap_server/service_slapd_disabled/rule.yml index af9de4746320..bc63db664410 100644 --- a/linux_os/guide/services/ldap/openldap_server/service_slapd_disabled/rule.yml +++ b/linux_os/guide/services/ldap/openldap_server/service_slapd_disabled/rule.yml @@ -30,4 +30,5 @@ template: vars: servicename: slapd packagename: openldap-servers + packagename@debian13: slapd packagename@ubuntu2404: slapd diff --git a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/disabling_nfsd/service_nfs_disabled/rule.yml b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/disabling_nfsd/service_nfs_disabled/rule.yml index 0fb7af297083..17c38a189721 100644 --- a/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/disabling_nfsd/service_nfs_disabled/rule.yml +++ b/linux_os/guide/services/nfs_and_rpc/nfs_configuring_clients/disabling_nfsd/service_nfs_disabled/rule.yml @@ -44,5 +44,6 @@ template: vars: servicename: nfs-server packagename: nfs-utils + packagename@debian13: nfs-kernel-server packagename@ubuntu2404: nfs-kernel-server packagename@sle15: nfs-kernel-server diff --git a/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml b/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml index 8b8cc34064e4..269e1acba30f 100644 --- a/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml +++ b/linux_os/guide/services/obsolete/r_services/package_rsh_removed/rule.yml @@ -4,7 +4,7 @@ documentation_complete: true title: 'Uninstall rsh Package' description: |- - {{% if 'ubuntu' not in product %}} + {{% if 'ubuntu' not in product and 'debian' not in product %}} The rsh package contains the client commands {{% else %}} The rsh-client package contains the client commands @@ -16,7 +16,7 @@ rationale: |- been replaced with the more secure SSH package. Even if the server is removed, it is best to ensure the clients are also removed to prevent users from inadvertently attempting to use these commands and therefore exposing - {{% if 'ubuntu' not in product %}} + {{% if 'ubuntu' not in product and 'debian' not in product %}} their credentials. Note that removing the rsh package removes {{% else %}} their credentials. Note that removing the rsh-client package removes @@ -40,7 +40,7 @@ references: hipaa: 164.308(a)(4)(i),164.308(b)(1),164.308(b)(3),164.310(b),164.312(e)(1),164.312(e)(2)(ii) iso27001-2013: A.8.2.3,A.13.1.1,A.13.2.1,A.13.2.3,A.14.1.2,A.14.1.3 -{{% if 'ubuntu' not in product %}} +{{% if 'ubuntu' not in product and 'debian' not in product %}} ocil: '{{{ describe_package_remove(package="rsh") }}}' {{% else %}} ocil: '{{{ describe_package_remove(package="rsh-client") }}}' @@ -50,6 +50,7 @@ template: name: package_removed vars: pkgname: rsh + pkgname@debian13: rsh-client pkgname@ubuntu2204: rsh-client pkgname@ubuntu2404: rsh-client diff --git a/linux_os/guide/services/obsolete/service_rsyncd_disabled/rule.yml b/linux_os/guide/services/obsolete/service_rsyncd_disabled/rule.yml index d4ed1fb801e0..fe7b621c885f 100644 --- a/linux_os/guide/services/obsolete/service_rsyncd_disabled/rule.yml +++ b/linux_os/guide/services/obsolete/service_rsyncd_disabled/rule.yml @@ -38,6 +38,8 @@ template: vars: servicename: rsyncd packagename: rsync-daemon + packagename@debian13: rsync + servicename@debian13: rsync packagename@ol7: rsync packagename@sle12: rsync packagename@sle15: rsync diff --git a/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml b/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml index 1aa283f3983a..7b33fb6a2452 100644 --- a/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml +++ b/linux_os/guide/services/obsolete/tftp/package_tftp-server_removed/rule.yml @@ -1,4 +1,4 @@ -{{% if 'ubuntu' in product %}} +{{% if 'ubuntu' in product or 'debian' in product %}} {{%- set package = "tftpd-hpa" %}} {{% elif 'sle' in product %}} {{%- set package = "tftp" %}} diff --git a/linux_os/guide/services/obsolete/tftp/service_tftp_disabled/rule.yml b/linux_os/guide/services/obsolete/tftp/service_tftp_disabled/rule.yml index 510779e396e9..771275d4d102 100644 --- a/linux_os/guide/services/obsolete/tftp/service_tftp_disabled/rule.yml +++ b/linux_os/guide/services/obsolete/tftp/service_tftp_disabled/rule.yml @@ -1,6 +1,6 @@ documentation_complete: true -{{% if 'ubuntu' in product %}} +{{% if 'ubuntu' in product or 'debian' in product %}} {{%- set service_name = "tftpd-hpa" %}} {{%- set package = "tftpd-hpa" %}} {{% elif 'sle' in product or product == "slmicro5" %}} diff --git a/linux_os/guide/services/smb/disabling_samba/service_smb_disabled/rule.yml b/linux_os/guide/services/smb/disabling_samba/service_smb_disabled/rule.yml index 1043e53b6d29..ea0cbf6135eb 100644 --- a/linux_os/guide/services/smb/disabling_samba/service_smb_disabled/rule.yml +++ b/linux_os/guide/services/smb/disabling_samba/service_smb_disabled/rule.yml @@ -34,6 +34,7 @@ template: name: service_disabled vars: servicename: smb + servicename@debian13: smbd servicename@ubuntu2204: smbd servicename@ubuntu2404: smbd packagename: samba diff --git a/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml b/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml index 3d86a465a82e..5fcb1b044831 100644 --- a/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml +++ b/linux_os/guide/services/snmp/disabling_snmp_service/package_net-snmp_removed/rule.yml @@ -43,5 +43,6 @@ template: vars: pkgname: net-snmp pkgname@debian11: snmp + pkgname@debian13: snmpd pkgname@ubuntu2204: snmp pkgname@ubuntu2404: snmpd diff --git a/linux_os/guide/services/snmp/disabling_snmp_service/service_snmpd_disabled/rule.yml b/linux_os/guide/services/snmp/disabling_snmp_service/service_snmpd_disabled/rule.yml index 0453930173d0..8fea1564215f 100644 --- a/linux_os/guide/services/snmp/disabling_snmp_service/service_snmpd_disabled/rule.yml +++ b/linux_os/guide/services/snmp/disabling_snmp_service/service_snmpd_disabled/rule.yml @@ -38,5 +38,6 @@ template: servicename: snmpd packagename@debian11: snmpd packagename@debian12: snmpd + packagename@debian13: snmpd packagename@ubuntu2404: snmpd packagename: net-snmp diff --git a/linux_os/guide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml b/linux_os/guide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml index 0c29abce28b6..1635b31334c3 100644 --- a/linux_os/guide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml +++ b/linux_os/guide/services/xwindows/disabling_xwindows/package_xorg-x11-server-common_removed/rule.yml @@ -60,5 +60,6 @@ template: name: package_removed vars: pkgname: xorg-x11-server-common + pkgname@debian13: xserver-common pkgname@ubuntu2204: xserver-common pkgname@ubuntu2404: xserver-common diff --git a/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml b/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml index 2e453c22b4f8..2654ff448e53 100644 --- a/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml +++ b/linux_os/guide/system/software/gnome/package_gdm_removed/rule.yml @@ -4,7 +4,7 @@ documentation_complete: true title: 'Remove the GDM Package Group' description: |- - {{% if 'ubuntu' not in product %}} + {{% if 'ubuntu' not in product and 'debian' not in product %}} By removing the gdm package, the system no longer has GNOME installed. {{% else %}} By removing the gdm3 package, the system no longer has GNOME installed. @@ -12,7 +12,7 @@ description: |- If X Windows is not installed then the system cannot boot into graphical user mode. This prevents the system from being accidentally or maliciously booted into a graphical.target mode. To do so, run the following command: - {{% if 'ubuntu' not in product %}} + {{% if 'ubuntu' not in product and 'debian' not in product %}} 
$ sudo yum remove gdm
{{% else %}} 
$ sudo apt remove gdm3
@@ -38,7 +38,7 @@ references: nist: CM-7(a),CM-7(b),CM-6(a) srg: SRG-OS-000480-GPOS-00227 -{{% if 'ubuntu' not in product %}} +{{% if 'ubuntu' not in product and 'debian' not in product %}} ocil_clause: 'gdm has not been removed' ocil: |- @@ -66,5 +66,6 @@ template: name: package_removed vars: pkgname: gdm + pkgname@debian13: gdm3 pkgname@ubuntu2204: gdm3 pkgname@ubuntu2404: gdm3 diff --git a/shared/templates/service_disabled_guard_var/bash.template b/shared/templates/service_disabled_guard_var/bash.template index 0afd3332d867..38535e386905 100644 --- a/shared/templates/service_disabled_guard_var/bash.template +++ b/shared/templates/service_disabled_guard_var/bash.template @@ -1,4 +1,4 @@ -# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu +# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ol,multi_platform_rhv,multi_platform_sle,multi_platform_ubuntu,multi_platform_debian # reboot = false # strategy = disable # complexity = low