Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ option(SSG_PRODUCT_JRE "If enabled, the JRE SCAP content will be built" ${SSG_PR
option(SSG_PRODUCT_MACOS1015 "If enabled, the Apple macOS 10.15 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_OCP3 "If enabled, the OCP3 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_OCP4 "If enabled, the OCP4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_RHCOS4 "If enabled, the RHCOS4 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_OL7 "If enabled, the Oracle Linux 7 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_OL8 "If enabled, the Oracle Linux 8 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
option(SSG_PRODUCT_OPENSUSE "If enabled, the openSUSE SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
Expand Down Expand Up @@ -245,6 +246,7 @@ message(STATUS "JRE: ${SSG_PRODUCT_JRE}")
message(STATUS "MacOS 1015: ${SSG_PRODUCT_MACOS1015}")
message(STATUS "OCP3: ${SSG_PRODUCT_OCP3}")
message(STATUS "OCP4: ${SSG_PRODUCT_OCP4}")
message(STATUS "RHCOS4: ${SSG_PRODUCT_RHCOS4}")
message(STATUS "Oracle Linux 7: ${SSG_PRODUCT_OL7}")
message(STATUS "Oracle Linux 8: ${SSG_PRODUCT_OL8}")
message(STATUS "openSUSE: ${SSG_PRODUCT_OPENSUSE}")
Expand Down Expand Up @@ -332,6 +334,9 @@ endif()
if (SSG_PRODUCT_OCP4)
add_subdirectory("ocp4")
endif()
if (SSG_PRODUCT_RHCOS4)
add_subdirectory("rhcos4")
endif()
if (SSG_PRODUCT_OL7)
add_subdirectory("ol7")
endif()
Expand Down
3 changes: 2 additions & 1 deletion Dockerfiles/ocp4_content
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ COPY . .

RUN microdnf -y install cmake make git /usr/bin/python3 python3-pyyaml python3-jinja2 openscap-utils

RUN ./build_product --debug ocp4 rhel7 rhel8
RUN ./build_product --debug ocp4 rhel7 rhel8 rhcos4

FROM registry.access.redhat.com/ubi8/ubi-minimal
WORKDIR /
COPY --from=builder /content/build/ssg-ocp4-ds.xml .
COPY --from=builder /content/build/ssg-rhel7-ds.xml .
COPY --from=builder /content/build/ssg-rhel8-ds.xml .
COPY --from=builder /content/build/ssg-rhcos4-ds.xml .
3 changes: 2 additions & 1 deletion Dockerfiles/quay_publish
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ FROM fedora:latest as builder
RUN dnf -y install cmake make git /usr/bin/python3 python3-pyyaml python3-jinja2 openscap-utils
RUN git clone --depth 1 https://github.com/ComplianceAsCode/content
WORKDIR /content
RUN ./build_product --debug ocp4
RUN ./build_product --debug ocp4 rhcos4

FROM registry.access.redhat.com/ubi8/ubi-minimal
WORKDIR /
COPY --from=builder /content/build/ssg-ocp4-ds.xml .
COPY --from=builder /content/build/ssg-rhcos4-ds.xml .
1 change: 1 addition & 0 deletions build_product
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ all_cmake_products=(
JRE
OCP3
OCP4
RHCOS4
OL7
OL8
OPENSUSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: ocp4,ol7,ol8,rhel6,rhel7,rhel8,rhv4
prodtype: ocp4,rhcos4,ol7,ol8,rhel6,rhel7,rhel8,rhv4

title: 'Uninstall bind Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Install fapolicyd Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: ocp4,ol8,rhel8
prodtype: ocp4,rhcos4,ol8,rhel8

title: 'Enable the File Access Policy Service'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: ocp4,rhel6,rhel7,rhel8
prodtype: ocp4,rhcos4,rhel6,rhel7,rhel8

title: 'Uninstall 389-ds-base Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel7,rhel8,rhv4,sle15
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel7,rhel8,rhv4,sle15

title: 'Ensure LDAP client is not installed'

Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_client_only/rule.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Disable chrony daemon from acting as server'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Disable network management of chrony daemon'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel7,rhel8,rhv4,wrlinux1019

title: 'Configure Time Service Maxpoll Interval'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel7,rhel8,rhv4
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel7,rhel8,rhv4

title: 'Specify Additional Remote NTP Servers'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel7,rhel8,rhv4
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel7,rhel8,rhv4

title: 'Specify a Remote NTP Server'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel7,rhel8,rhv4
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel7,rhel8,rhv4

title: 'Enable the NTP Daemon'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: rhel7,ol7,rhel8,ol8,fedora,rhv4,ocp4
prodtype: rhel7,ol7,rhel8,ol8,fedora,rhv4,ocp4,rhcos4

title: 'Ensure rsyncd service is diabled'

Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/rng/service_rngd_enabled/rule.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Enable the Hardware RNG Entropy Gatherer Service'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: ocp4,rhel6,rhel7,rhel8,rhv4,sle15
prodtype: ocp4,rhcos4,rhel6,rhel7,rhel8,rhv4,sle15

title: 'Install the Samba Common Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: debian10,debian9,fedora,ocp4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle15,wrlinux1019
prodtype: debian10,debian9,fedora,ocp4,rhcos4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle15,wrlinux1019

title: 'Uninstall net-snmp Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4
prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4,rhcos4

title: 'Verify Group Who Owns SSH Server config file'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4
prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4,rhcos4

title: 'Verify Owner on SSH Server config file'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4
prodtype: rhel6,rhel7,rhel8,rhv4,sle15,ocp4,rhcos4

title: 'Verify Permissions on SSH Server config file'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: debian10,debian8,debian9,fedora,ocp4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle12,sle15,ubuntu1404,ubuntu1604,ubuntu1804,wrlinux1019,wrlinux8
prodtype: debian10,debian8,debian9,fedora,ocp4,rhcos4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle12,sle15,ubuntu1404,ubuntu1604,ubuntu1804,wrlinux1019,wrlinux8

title: 'Install the OpenSSH Server Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: debian10,debian8,debian9,fedora,ocp4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle12,sle15,ubuntu1404,ubuntu1604,ubuntu1804,wrlinux1019,wrlinux8
prodtype: debian10,debian8,debian9,fedora,ocp4,rhcos4,ol7,ol8,rhel6,rhel7,rhel8,rhv4,sle12,sle15,ubuntu1404,ubuntu1604,ubuntu1804,wrlinux1019,wrlinux8

title: 'Remove the OpenSSH Server Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp
# platform = multi_platform_rhel,multi_platform_fedora,multi_platform_ocp,multi_platform_rhcos
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfig
spec:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Configure SSSD to run as user sssd'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Log USBGuard daemon audit events using Linux Audit'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol7,ol8,rhel6,rhel7,rhel8,rhv4
prodtype: fedora,ocp4,rhcos4,ol7,ol8,rhel6,rhel7,rhel8,rhv4

title: 'Install usbguard Package'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Enable the USBGuard Service'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Authorize Human Interface Devices in USBGuard daemon'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Authorize Human Interface Devices and USB hubs in USBGuard daemon'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
documentation_complete: true

prodtype: fedora,ocp4,ol8,rhel8
prodtype: fedora,ocp4,rhcos4,ol8,rhel8

title: 'Authorize USB hubs in USBGuard daemon'

Expand Down
Loading