From 05e68cf10c65df33d69361065f25c8d3762317c4 Mon Sep 17 00:00:00 2001
From: Malhar Jivrajani <mjivraja@redhat.com>
Date: Tue, 23 Jan 2024 20:00:44 +0530
Subject: [PATCH] Fix firewall commands for ports & services - Proxy

This applies to Proxy Server as well:
https://github.com/theforeman/foreman-documentation/pull/2630
---
 .../proc_enabling-connections-to-capsule.adoc | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/guides/common/modules/proc_enabling-connections-to-capsule.adoc b/guides/common/modules/proc_enabling-connections-to-capsule.adoc
index e8383a96527..8b443963c7e 100644
--- a/guides/common/modules/proc_enabling-connections-to-capsule.adoc
+++ b/guides/common/modules/proc_enabling-connections-to-capsule.adoc
@@ -7,8 +7,18 @@ On the base operating system on which you want to install {SmartProxy}, you must
 include::snip_firewalld.adoc[]
 
 .Procedure
-
-. On the base operating system on which you want to install {SmartProxy}, enter the following command to open the ports for {ProjectServer} and clients communication to {SmartProxyServer}:
+ifdef::katello,satellite,orcharhino[]
+. Open the ports for clients on {SmartProxyServer}:
++
+[options="nowrap"]
+----
+# firewall-cmd \
+--add-port="5647/tcp" \
+--add-port="8000/tcp" \
+--add-port="9090/tcp"
+----
+endif::[]
+. Allow access to services on {SmartProxyServer}:
 +
 [options="nowrap"]
 ----
@@ -19,20 +29,15 @@ include::snip_firewalld.adoc[]
 ifdef::katello,satellite,orcharhino[]
 --add-service=http \
 --add-service=https \
---add-port="5647/tcp" \
 endif::[]
---add-service=puppetmaster \
 ifndef::katello,satellite,orcharhino[]
---add-service=foreman-proxy
-endif::[]
-ifdef::katello,satellite,orcharhino[]
---add-port="8000/tcp" \
---add-port="9090/tcp"
+--add-service=foreman-proxy \
 endif::[]
+--add-service=puppetmaster
 ----
-
 . Make the changes persistent:
 +
+[options="nowrap"]
 ----
 # firewall-cmd --runtime-to-permanent
 ----