Add cis_default banner text

jan-cerny · jan-cerny · commit 0c0098c3533d · 2026-02-09T14:44:51.000+01:00
Create a new option with the same contents but with the selector
different than "default".
Using the "default" selector might cause conflicts in some cases
for example when generating profile Ansible Playbooks.
diff --git a/controls/ccn_ol9.yml b/controls/ccn_ol9.yml
@@ -625,11 +625,11 @@ controls:
           - dconf_gnome_login_banner_text
           - sshd_enable_warning_banner_net
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
           - motd_banner_regex=cis_default
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
           - remote_login_banner_regex=cis_default
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: A.11.SEC-OL5
       title: Network Acess to the System is Controlled
diff --git a/controls/cis_al2023.yml b/controls/cis_al2023.yml
@@ -468,7 +468,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: 1.7.2
       title: Ensure local login warning banner is configured properly (Automated)
@@ -478,7 +478,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.7.3
       title: Ensure remote login warning banner is configured properly (Automated)
@@ -488,7 +488,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: 1.7.4
       title: Ensure permissions on /etc/motd are configured (Automated)
diff --git a/controls/cis_almalinux9.yml b/controls/cis_almalinux9.yml
@@ -692,7 +692,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.3
       title: Ensure GDM disable-user-list option is enabled (Automated)
diff --git a/controls/cis_debian12.yml b/controls/cis_debian12.yml
@@ -541,7 +541,7 @@ controls:
           - l1_workstation
       rules:
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
       status: automated
diff --git a/controls/cis_fedora.yml b/controls/cis_fedora.yml
@@ -711,7 +711,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.2
       title: Ensure GDM disable-user-list is configured (Automated)
diff --git a/controls/cis_sle12.yml b/controls/cis_sle12.yml
@@ -457,7 +457,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: 1.8.1.2
       title: Ensure local login warning banner is configured properly (Automated)
@@ -468,7 +468,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.1.3
       title: Ensure remote login warning banner is configured properly (Automated)
@@ -479,7 +479,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: 1.8.1.4
       title: Ensure permissions on /etc/motd are configured (Automated)
@@ -539,7 +539,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 2.1.1
       title: Ensure xinetd is not installed (Automated)
diff --git a/controls/cis_sle15.yml b/controls/cis_sle15.yml
@@ -465,7 +465,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.1.3
       title: Ensure remote login warning banner is configured properly (Automated)
@@ -476,7 +476,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: 1.8.1.4
       title: Ensure permissions on /etc/motd are configured (Automated)
@@ -535,7 +535,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 2.1.1
       title: Ensure xinetd is not installed (Automated)
diff --git a/controls/cis_ubuntu2204.yml b/controls/cis_ubuntu2204.yml
@@ -529,7 +529,7 @@ controls:
           - l1_workstation
       rules:
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
       status: automated
diff --git a/controls/cis_ubuntu2404.yml b/controls/cis_ubuntu2404.yml
@@ -562,7 +562,7 @@ controls:
           - l1_workstation
       rules:
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
       status: automated
diff --git a/controls/general_sle15.yml b/controls/general_sle15.yml
@@ -470,7 +470,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: SLES-15-151050030
       title: Modify the System Login Banner
@@ -480,7 +480,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: SLES-15-151050045
       title: Modify the System Login Banner for Remote Connections
@@ -490,7 +490,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: SLES-15-151050060
       title: Configure access to the Message of the Day Banner
@@ -539,7 +539,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: SLES-15-151200135
       title: Disable the GDM Login User List
diff --git a/controls/general_slmicro5.yml b/controls/general_slmicro5.yml
@@ -269,7 +269,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: SLEM-5-SET-08010200
       title: Modify the System Login Banner
@@ -279,7 +279,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: SLEM-5-SET-08010300
       title: Modify the System Login Banner for Remote Connections
@@ -289,7 +289,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: SLEM-5-SET-08010400
       title: Verify Ownership and Permissions of/on Message of the Day Banner
diff --git a/controls/std_kylinserver10.yml b/controls/std_kylinserver10.yml
@@ -119,7 +119,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.14
       title: ensure-message-of-the-day-is-configured-properly
@@ -129,7 +129,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: 1.15
       title: Ensure sshd PermitRootLogin is disabled (Automated)
diff --git a/controls/std_tencentos4.yml b/controls/std_tencentos4.yml
@@ -114,7 +114,7 @@ controls:
       rules:
           - banner_etc_motd
           - motd_banner_regex=cis_banners
-          - motd_banner_text=default
+          - motd_banner_text=cis_default
 
     - id: 1.4.2
       title: Ensure local login warning banner is configured properly
@@ -124,7 +124,7 @@ controls:
       rules:
           - banner_etc_issue
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.4.3
       title: Ensure remote login warning banner is configured properly
@@ -134,7 +134,7 @@ controls:
       rules:
           - banner_etc_issue_net
           - remote_login_banner_regex=cis_banners
-          - remote_login_banner_text=default
+          - remote_login_banner_text=cis_default
 
     - id: 1.4.4
       title: Ensure permissions on /etc/motd are configured
diff --git a/controls/stig_ol9.yml b/controls/stig_ol9.yml
@@ -1982,7 +1982,7 @@ controls:
       rules:
           - dconf_gnome_login_banner_text
           - login_banner_regex=dod_default
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: OL09-00-002122
       levels:
diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/ubuntu_wrong_value.fail.sh b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/ubuntu_wrong_value.fail.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # platform = multi_platform_ubuntu
 # packages = gdm3
-# variables = login_banner_text=default
+# variables = login_banner_text=cis_default
 
 source $SHARED/dconf_test_functions.sh
 clean_dconf_settings
diff --git a/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/ubuntu_wrong_value_defaults.fail.sh b/linux_os/guide/system/accounts/accounts-banners/gui_login_banner/dconf_gnome_login_banner_text/tests/ubuntu_wrong_value_defaults.fail.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # platform = multi_platform_ubuntu
 # packages = gdm3
-# variables = login_banner_text=default
+# variables = login_banner_text=cis_default
 
 source $SHARED/dconf_test_functions.sh
 clean_dconf_settings
diff --git a/linux_os/guide/system/accounts/accounts-banners/login_banner_text.var b/linux_os/guide/system/accounts/accounts-banners/login_banner_text.var
@@ -19,6 +19,8 @@ options:
 # There is a generic content in case a remediation is necessary.
     default: |
         Authorized users only. All activity may be monitored and reported.
+    cis_default: |
+        Authorized users only. All activity may be monitored and reported.
     dod_default: |
         You are accessing a U.S. Government (USG) Information System (IS) that is
         provided for USG-authorized use only. By using this IS (which includes any
diff --git a/linux_os/guide/system/accounts/accounts-banners/motd_banner_text.var b/linux_os/guide/system/accounts/accounts-banners/motd_banner_text.var
@@ -19,6 +19,8 @@ options:
 # There is a generic content in case a remediation is necessary.
     default: |
         Authorized users only. All activity may be monitored and reported.
+    cis_default: |
+        Authorized users only. All activity may be monitored and reported.
     dod_default: |
         You are accessing a U.S. Government (USG) Information System (IS) that is
         provided for USG-authorized use only. By using this IS (which includes any
diff --git a/linux_os/guide/system/accounts/accounts-banners/remote_login_banner_text.var b/linux_os/guide/system/accounts/accounts-banners/remote_login_banner_text.var
@@ -19,6 +19,8 @@ options:
 # There is a generic content in case a remediation is necessary.
     default: |
         Authorized users only. All activity may be monitored and reported.
+    cis_default: |
+        Authorized users only. All activity may be monitored and reported.
     dod_default: |
         You are accessing a U.S. Government (USG) Information System (IS) that is
         provided for USG-authorized use only. By using this IS (which includes any
diff --git a/products/anolis23/profiles/standard.profile b/products/anolis23/profiles/standard.profile
@@ -370,13 +370,13 @@ selections:
     ### Level 1
     - banner_etc_motd
     - motd_banner_regex=cis_banners
-    - motd_banner_text=default
+    - motd_banner_text=cis_default
 
     ## 4.2-ensure-local-login-warning-banner-is-configured-properly
     ### Level 1
     - banner_etc_issue
     - login_banner_regex=cis_banners
-    - login_banner_text=default
+    - login_banner_text=cis_default
 
     ## 4.3-ensure-remote-login-warning-banner-is-configured-properly
     ### Level 1
diff --git a/products/anolis8/profiles/standard.profile b/products/anolis8/profiles/standard.profile
@@ -370,13 +370,13 @@ selections:
     ### Level 1
     - banner_etc_motd
     - motd_banner_regex=cis_banners
-    - motd_banner_text=default
+    - motd_banner_text=cis_default
 
     ## 4.2-ensure-local-login-warning-banner-is-configured-properly
     ### Level 1
     - banner_etc_issue
     - login_banner_regex=cis_banners
-    - login_banner_text=default
+    - login_banner_text=cis_default
 
     ## 4.3-ensure-remote-login-warning-banner-is-configured-properly
     ### Level 1
diff --git a/products/openembedded/profiles/expanded.profile b/products/openembedded/profiles/expanded.profile
@@ -112,10 +112,10 @@ selections:
     - service_dovecot_disabled
     - banner_etc_motd
     - motd_banner_regex=cis_banners
-    - motd_banner_text=default
+    - motd_banner_text=cis_default
     - banner_etc_issue
     - login_banner_regex=cis_banners
-    - login_banner_text=default
+    - login_banner_text=cis_default
     - file_groupowner_etc_motd
     - file_owner_etc_motd
     - file_permissions_etc_motd
diff --git a/products/openembedded/profiles/standard.profile b/products/openembedded/profiles/standard.profile
@@ -107,10 +107,10 @@ selections:
     - service_dovecot_disabled
     - banner_etc_motd
     - motd_banner_regex=cis_banners
-    - motd_banner_text=default
+    - motd_banner_text=cis_default
     - banner_etc_issue
     - login_banner_regex=cis_banners
-    - login_banner_text=default
+    - login_banner_text=cis_default
     - file_groupowner_etc_motd
     - file_owner_etc_motd
     - file_permissions_etc_motd
diff --git a/products/rhel10/controls/cis_rhel10.yml b/products/rhel10/controls/cis_rhel10.yml
@@ -707,7 +707,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.2
       title: Ensure GDM disable-user-list is configured (Automated)
diff --git a/products/rhel8/controls/cis_rhel8.yml b/products/rhel8/controls/cis_rhel8.yml
@@ -741,7 +741,7 @@ controls:
           - dconf_gnome_banner_enabled
           - dconf_gnome_login_banner_text
           - login_banner_regex=cis_banners
-          - login_banner_text=default
+          - login_banner_text=cis_default
 
     - id: 1.8.2
       title: Ensure GDM disable-user-list is configured (Automated)
diff --git a/products/rhel9/controls/ccn_rhel9.yml b/products/rhel9/controls/ccn_rhel9.yml
diff --git a/products/rhel9/controls/cis_rhel9.yml b/products/rhel9/controls/cis_rhel9.yml
diff --git a/products/sle15/profiles/pcs-hardening-sap.profile b/products/sle15/profiles/pcs-hardening-sap.profile
diff --git a/products/sle15/profiles/pcs-hardening.profile b/products/sle15/profiles/pcs-hardening.profile
