From 48ee8c91dc9539ee9492a226a6e72f8d5b8b9188 Mon Sep 17 00:00:00 2001 From: Troy W Date: Thu, 6 Jun 2024 12:57:16 -0400 Subject: [PATCH] Separate installation of repos (#1272) --- changelogs/fragments/pr_1250.yml | 1 + docs/ZABBIX_AGENT_ROLE.md | 2 +- docs/ZABBIX_PROXY_ROLE.md | 2 +- docs/ZABBIX_SERVER_ROLE.md | 3 ++- docs/ZABBIX_WEB_ROLE.md | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changelogs/fragments/pr_1250.yml b/changelogs/fragments/pr_1250.yml index f1aad8cc9..236268b72 100644 --- a/changelogs/fragments/pr_1250.yml +++ b/changelogs/fragments/pr_1250.yml @@ -4,3 +4,4 @@ minor_changes: - All Roles - Include installation of GPG key for RHEL based operating systems. - All Roles - Add support for yum authentication on RHEL based operating systems. - All Roles - Add the `zabbix_manage_repo` variable. + - All Roles - Changed logic for installing selinux related changes based the status of selinux on the target system. diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md index 044272275..870c5ded6 100644 --- a/docs/ZABBIX_AGENT_ROLE.md +++ b/docs/ZABBIX_AGENT_ROLE.md @@ -123,7 +123,7 @@ The following is an overview of all available configuration default for this rol ### SElinux -Selinux options will be installed based on the status of selinux running on the target system. +Selinux changes will be installed based on the status of selinux running on the target system. * `selinux_allow_zabbix_run_sudo`: Default: `False`. Enable Zabbix root access on system. diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md index 19fafe15b..f91856355 100644 --- a/docs/ZABBIX_PROXY_ROLE.md +++ b/docs/ZABBIX_PROXY_ROLE.md @@ -139,7 +139,7 @@ The following is an overview of all available configuration default for this rol ### SElinux -Selinux options will be installed based on the status of selinux running on the target system. +Selinux changes will be installed based on the status of selinux running on the target system. ## Proxy diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md index 1e70f9cf3..0659aaf14 100644 --- a/docs/ZABBIX_SERVER_ROLE.md +++ b/docs/ZABBIX_SERVER_ROLE.md @@ -111,7 +111,8 @@ The following is an overview of all available configuration default for this rol ### SElinux -Selinux options will be installed based on the status of selinux running on the target system. +Selinux changes will be installed based on the status of selinux running on the target system. + * `selinux_allow_zabbix_can_network`: Default: `False`. * `selinux_allow_zabbix_can_http`: Default: `False`. diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md index 821c974a9..16558348e 100644 --- a/docs/ZABBIX_WEB_ROLE.md +++ b/docs/ZABBIX_WEB_ROLE.md @@ -152,7 +152,8 @@ The following properties are specific to Zabbix 5.0 and for the PHP(-FPM) config ### SElinux -Selinux options will be installed based on the status of selinux running on the target system. +Selinux changes will be installed based on the status of selinux running on the target system. + * `selinux_allow_httpd_can_connect_zabbix`: Default: `false`. Set SELinux boolean to allow httpd to connect to zabbix. * `selinux_allow_httpd_can_connect_ldap`: Default: `false`. Set SELinux boolean to allow httpd to connect to LDAP. * `selinux_allow_httpd_can_network_connect_db`: Default: `false` Set SELinux boolean to allow httpd to connect databases over the network.