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.

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

Remove Debian 10 Product #12205

Merged
merged 9 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/gate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,26 +59,26 @@ jobs:
working-directory: ./build

validate-debian:
name: Build, Test on Debian 10 (Container)
name: Build, Test on Debian 12 (Container)
runs-on: ubuntu-latest
container:
image: debian:buster
image: debian:bookworm
steps:
- name: Update the package repository
run: apt-get update
- name: Install Deps
run: apt-get install -y ansible-lint bats check cmake libopenscap8 libxml2-utils ninja-build python3-github python3-pip xsltproc libxslt1-dev libxml2-dev zlib1g-dev
run: apt-get install -y ansible-lint bats check cmake openscap-scanner openscap-utils libxml2-utils ninja-build python3-pip xsltproc libxslt1-dev libxml2-dev zlib1g-dev python3.11-venv
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- name: Upgrade pip python
run: pip3 install --upgrade pip
run: pip install --upgrade pip --break-system-packages
- name: Install deps python
run: pip3 install -r requirements.txt -r test-requirements.txt --ignore-installed PyYAML
run: pip3 install -r requirements.txt -r test-requirements.txt --ignore-installed PyYAML PyGithub --break-system-packages
- name: Build
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
run: |-
./build_product debian10 debian11 debian12
./build_product debian11 debian12
- name: Test
working-directory: ./build
run: ctest -j2 --output-on-failure -E unique-stigids
Expand Down
4 changes: 2 additions & 2 deletions .gitpod.launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
"type": "pickString",
"options": [
"chromium",
"debian10", "debian11",
"debian11", "debian12",
"eap6",
"fedora",
"firefox",
"macos1015",
"ocp4",
"ol7", "ol8",
"opensuse", "rhel8", "rhel9",
"opensuse", "rhel8", "rhel9", "rhel10",
"rhosp10", "rhosp13",
"rhv4",
"sle12", "sle15",
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ option(SSG_PRODUCT_ALINUX3 "If enabled, the Alibaba Cloud Linux 3 SCAP content w
option(SSG_PRODUCT_ANOLIS8 "If enabled, the Anolis OS 8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_ANOLIS23 "If enabled, the Anolis OS 23 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_CHROMIUM "If enabled, the Chromium SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_DEBIAN10 "If enabled, the Debian 10 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_DEBIAN11 "If enabled, the Debian 11 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_DEBIAN12 "If enabled, the Debian 12 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_EKS "If enabled, the EKS SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
Expand Down Expand Up @@ -317,7 +316,6 @@ message(STATUS "Alibaba Cloud Linux 3: ${SSG_PRODUCT_ALINUX3}")
message(STATUS "Anolis OS 8: ${SSG_PRODUCT_ANOLIS8}")
message(STATUS "Anolis OS 23: ${SSG_PRODUCT_ANOLIS23}")
message(STATUS "Chromium: ${SSG_PRODUCT_CHROMIUM}")
message(STATUS "Debian 10: ${SSG_PRODUCT_DEBIAN10}")
message(STATUS "Debian 11: ${SSG_PRODUCT_DEBIAN11}")
message(STATUS "Debian 12: ${SSG_PRODUCT_DEBIAN12}")
message(STATUS "Example: ${SSG_PRODUCT_EXAMPLE}")
Expand Down Expand Up @@ -389,9 +387,6 @@ if(SSG_PRODUCT_CHROMIUM)
add_subdirectory("products/chromium" "chromium")
endif()

if(SSG_PRODUCT_DEBIAN10)
add_subdirectory("products/debian10" "debian10")
endif()
if(SSG_PRODUCT_DEBIAN11)
add_subdirectory("products/debian11" "debian11")
endif()
Expand Down
1 change: 0 additions & 1 deletion build_product
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ all_cmake_products=(
ANOLIS8
ANOLIS23
CHROMIUM
DEBIAN10
DEBIAN11
DEBIAN12
EXAMPLE
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/developer/03_creating_content.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ MULTI_PLATFORM_LIST = ["rhel", "fedora", "rhosp", "rhv", "debian", "ubuntu",
<pre>
...
MULTI_PLATFORM_MAPPING = {
"multi_platform_debian": ["debian10", "debian11"],
"multi_platform_debian": ["debian11", "debian12"],
"multi_platform_example": ["example"],
<b>"multi_platform_custom": ["custom6"],</b>
"multi_platform_fedora": ["fedora"],
Expand Down
1 change: 1 addition & 0 deletions docs/manual/user/30_content_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Below is list of products that have been removed from the project.
|----------------------------------------------|--------------------|------------------------------------------------------------------------------------|
| Debian 8 | June 30, 2020 | [content 0.1.52](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.52) |
| Debian 9 | June 30, 2022 | [content 0.1.65](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.65) |
| Debian 10 | June 30, 2024 | [content 0.1.73](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.73) |
| Java Runtime Environment | - | [content 0.1.64](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.64) |
| JBoss EAP 5 | November 30, 2016 | [content 0.1.35](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.35) |
| JBoss EAP 6 | June 30, 2019 | [content 0.1.53](https://github.com/ComplianceAsCode/content/releases/tag/v0.1.53) |
Expand Down
1 change: 0 additions & 1 deletion linux_os/guide/auditing/package_audit_installed/rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,5 @@ template:
pkgname@ubuntu1804: auditd
pkgname@ubuntu2004: auditd
pkgname@ubuntu2204: auditd
pkgname@debian10: auditd
pkgname@debian11: auditd
pkgname@debian12: auditd
1 change: 0 additions & 1 deletion linux_os/guide/auditing/service_auditd_enabled/rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ template:
vars:
servicename: auditd
packagename: audit
packagename@debian10: auditd
packagename@debian11: auditd
packagename@debian12: auditd
packagename@ubuntu1604: auditd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ template:
name: package_removed
vars:
pkgname: net-snmp
pkgname@debian10: snmp
pkgname@debian11: snmp
pkgname@ubuntu1604: snmp
pkgname@ubuntu1804: snmp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ template:
name: service_disabled
vars:
servicename: snmpd
packagename@debian10: snmpd
packagename@debian11: snmpd
packagename@debian12: snmpd
packagename: net-snmp
1 change: 0 additions & 1 deletion linux_os/guide/services/ssh/service_sshd_disabled/rule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ template:
packagename: openssh-server
packagename@opensuse: openssh
packagename@sle12: openssh
daemonname@debian10: ssh
daemonname@debian11: ssh
daemonname@ubuntu1604: ssh
daemonname@ubuntu1804: ssh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ identifiers:
cce@sle15: CCE-91394-7

references:
cis@debian10: 9.3.2
cis@debian11: 9.3.2
cis@sle12: 5.2.5
cis@sle15: 5.2.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{{ oval_metadata("Syslog logs should be configured") }}}

<criteria operator="AND">
{{% if product in ["debian10", "debian11", "ubuntu1604", "ubuntu1804"] %}}
{{% if product in ["debian11", "ubuntu1604", "ubuntu1804"] %}}
<extend_definition comment="rsyslog daemon is used as local logging daemon" definition_ref="package_rsyslog_installed" />
{{% endif %}}
<criteria operator="OR">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ template:
vars:
filepath: /etc/gshadow-
gid_or_name: '0'
gid_or_name@debian10: '42'
gid_or_name@debian11: '42'
gid_or_name@debian12: '42'
gid_or_name@ubuntu1604: '42'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ template:
vars:
filepath: /etc/gshadow-
filemode: '0000'
filemode@debian10: '0640'
filemode@debian11: '0640'
filemode@debian12: '0640'
filemode@ubuntu1604: '0640'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ template:
vars:
filepath: /etc/shadow-
filemode: '0000'
filemode@debian10: '0640'
filemode@debian11: '0640'
filemode@debian12: '0640'
filemode@ubuntu1604: '0640'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ template:
vars:
filepath: /etc/gshadow
filemode: '0000'
filemode@debian10: '0640'
filemode@debian11: '0640'
filemode@debian12: '0640'
filemode@ubuntu1604: '0640'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ template:
vars:
filepath: /etc/shadow
filemode: '0000'
filemode@debian10: '0640'
filemode@debian11: '0640'
filemode@debian12: '0640'
filemode@sle12: '0640'
Expand Down
6 changes: 0 additions & 6 deletions products/debian10/CMakeLists.txt

This file was deleted.

Empty file.
42 changes: 0 additions & 42 deletions products/debian10/product.yml

This file was deleted.

34 changes: 0 additions & 34 deletions products/debian10/profiles/anssi_np_nt28_average.profile

This file was deleted.

11 changes: 0 additions & 11 deletions products/debian10/profiles/anssi_np_nt28_high.profile

This file was deleted.

31 changes: 0 additions & 31 deletions products/debian10/profiles/anssi_np_nt28_minimal.profile

This file was deleted.

18 changes: 0 additions & 18 deletions products/debian10/profiles/anssi_np_nt28_restrictive.profile

This file was deleted.

Loading
Loading