From 00807f779d94151b9d95549f563002840819a85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Tue, 7 May 2019 09:14:59 +0200 Subject: [PATCH] Rename group sap to sap_host Workaround for OpenSCAP bug described in https://github.com/OpenSCAP/openscap/issues/1325 The template cannot handle situation when a profile has a same name as some group. 'sap' group conflicts with 'sap' profile in OL7 content. These settings are not about configuring SAP itself but about configuring the underlying OS host, let's rename the group to sap_host. --- .../accounts_authorized_local_users/bash/shared.sh | 0 .../accounts_authorized_local_users/oval/shared.xml | 0 .../{sap => sap_host}/accounts_authorized_local_users/rule.yml | 0 .../accounts_authorized_local_users_sidadm_orasid/bash/shared.sh | 0 .../accounts_authorized_local_users_sidadm_orasid/oval/shared.xml | 0 .../accounts_authorized_local_users_sidadm_orasid/rule.yml | 0 linux_os/guide/system/software/{sap => sap_host}/group.yml | 0 .../software/{sap => sap_host}/package_glibc_installed/rule.yml | 0 .../software/{sap => sap_host}/package_uuidd_installed/rule.yml | 0 .../var_accounts_authorized_local_users_regex.var | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users/bash/shared.sh (100%) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users/oval/shared.xml (100%) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users/rule.yml (100%) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh (100%) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users_sidadm_orasid/oval/shared.xml (100%) rename linux_os/guide/system/software/{sap => sap_host}/accounts_authorized_local_users_sidadm_orasid/rule.yml (100%) rename linux_os/guide/system/software/{sap => sap_host}/group.yml (100%) rename linux_os/guide/system/software/{sap => sap_host}/package_glibc_installed/rule.yml (100%) rename linux_os/guide/system/software/{sap => sap_host}/package_uuidd_installed/rule.yml (100%) rename linux_os/guide/system/software/{sap => sap_host}/var_accounts_authorized_local_users_regex.var (100%) diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users/bash/shared.sh b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users/bash/shared.sh similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users/bash/shared.sh rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users/bash/shared.sh diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users/oval/shared.xml b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users/oval/shared.xml similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users/oval/shared.xml rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users/oval/shared.xml diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users/rule.yml b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users/rule.yml similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users/rule.yml rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users/rule.yml diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/bash/shared.sh diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/oval/shared.xml b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/oval/shared.xml similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/oval/shared.xml rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/oval/shared.xml diff --git a/linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/rule.yml b/linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/rule.yml similarity index 100% rename from linux_os/guide/system/software/sap/accounts_authorized_local_users_sidadm_orasid/rule.yml rename to linux_os/guide/system/software/sap_host/accounts_authorized_local_users_sidadm_orasid/rule.yml diff --git a/linux_os/guide/system/software/sap/group.yml b/linux_os/guide/system/software/sap_host/group.yml similarity index 100% rename from linux_os/guide/system/software/sap/group.yml rename to linux_os/guide/system/software/sap_host/group.yml diff --git a/linux_os/guide/system/software/sap/package_glibc_installed/rule.yml b/linux_os/guide/system/software/sap_host/package_glibc_installed/rule.yml similarity index 100% rename from linux_os/guide/system/software/sap/package_glibc_installed/rule.yml rename to linux_os/guide/system/software/sap_host/package_glibc_installed/rule.yml diff --git a/linux_os/guide/system/software/sap/package_uuidd_installed/rule.yml b/linux_os/guide/system/software/sap_host/package_uuidd_installed/rule.yml similarity index 100% rename from linux_os/guide/system/software/sap/package_uuidd_installed/rule.yml rename to linux_os/guide/system/software/sap_host/package_uuidd_installed/rule.yml diff --git a/linux_os/guide/system/software/sap/var_accounts_authorized_local_users_regex.var b/linux_os/guide/system/software/sap_host/var_accounts_authorized_local_users_regex.var similarity index 100% rename from linux_os/guide/system/software/sap/var_accounts_authorized_local_users_regex.var rename to linux_os/guide/system/software/sap_host/var_accounts_authorized_local_users_regex.var